Skip to content

Commit f76a267

Browse files
authored
Fix pd retry not recovered for 60s (#182)
Signed-off-by: birdstorm <samuelwyf@hotmail.com>
1 parent 98f0c13 commit f76a267

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ synchronized boolean switchLeader(List<String> leaderURLs) {
418418
return createLeaderWrapper(leaderUrlStr);
419419
}
420420

421-
private boolean createLeaderWrapper(String leaderUrlStr) {
421+
private synchronized boolean createLeaderWrapper(String leaderUrlStr) {
422422
try {
423423
URI newLeader = addrToUri(leaderUrlStr);
424424
leaderUrlStr = uriToAddr(newLeader);

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public boolean handleResponseError(BackOffer backOffer, RespT resp) {
7373
@Override
7474
public boolean handleRequestError(BackOffer backOffer, Exception e) {
7575
backOffer.doBackOff(BackOffFunction.BackOffFuncType.BoPDRPC, e);
76+
client.updateLeader();
7677
return true;
7778
}
7879
}

src/test/java/org/tikv/common/PDMockServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void addGetMemberResp(GetMembersResponse r) {
4343
@Override
4444
public void getMembers(GetMembersRequest request, StreamObserver<GetMembersResponse> resp) {
4545
try {
46-
resp.onNext(getMembersResp.removeFirst().get());
46+
resp.onNext(getMembersResp.getFirst().get());
4747
resp.onCompleted();
4848
} catch (Exception e) {
4949
resp.onError(Status.INTERNAL.asRuntimeException());

0 commit comments

Comments
 (0)