Skip to content

Commit 5c86cbd

Browse files
committed
use sync update leader
Signed-off-by: iosmanthus <myosmanthustree@gmail.com>
1 parent 743415b commit 5c86cbd

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

src/main/java/org/tikv/common/AbstractGRPCClient.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,6 @@ protected boolean checkHealth(BackOffer backOffer, String addressStr, HostMappin
204204
SlowLogSpan checkHealthSpan = backOffer.getSlowLog().start("check_health");
205205
try {
206206
return doCheckHealth(backOffer, addressStr, hostMapping);
207-
} catch (Exception e) {
208-
return false;
209207
} finally {
210208
checkHealthSpan.end();
211209
}

src/main/java/org/tikv/common/PDClient.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,6 @@ private GetMembersResponse getMembers(BackOffer backOffer, URI uri) {
469469
SlowLogSpan getMembersSpan = backOffer.getSlowLog().start("get_members");
470470
try {
471471
return doGetMembers(backOffer, uri);
472-
} catch (Exception e) {
473-
return null;
474472
} finally {
475473
getMembersSpan.end();
476474
}
@@ -527,7 +525,7 @@ synchronized boolean createFollowerClientWrapper(
527525

528526
public void tryUpdateLeaderOrForwardFollower(BackOffer backOffer) {
529527
if (leaderLock.tryLock()) {
530-
SlowLogSpan updateLeaderSpan = backOffer.getSlowLog().start("try_update_leader");
528+
SlowLogSpan updateLeaderSpan = backOffer.getSlowLog().start("update_leader");
531529
try {
532530
updateLeaderOrForwardFollower(backOffer);
533531
} finally {

src/main/java/org/tikv/common/operation/PDErrorHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public boolean handleRequestError(BackOffer backOffer, Exception e) {
8686
return false;
8787
}
8888
backOffer.doBackOff(BackOffFunction.BackOffFuncType.BoPDRPC, e);
89-
SlowLogSpan updateLeaderSpan = backOffer.getSlowLog().start("update_leader");
89+
SlowLogSpan updateLeaderSpan = backOffer.getSlowLog().start("try_update_leader");
9090
try {
9191
client.tryUpdateLeaderOrForwardFollower(backOffer);
9292
} finally {

0 commit comments

Comments
 (0)