Skip to content

fix region not invalidate when using grpc forward #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marsishandsome wants to merge 1 commit into from
Closed

fix region not invalidate when using grpc forward #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/java/org/tikv/common/operation/RegionErrorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,14 @@ private boolean onRegionEpochNotMatch(BackOffer backOffer, List<Metapb.Region> c
@Override
public boolean handleRequestError(BackOffer backOffer, Exception e) {
if (recv.onStoreUnreachable()) {
backOffer.doBackOff(BackOffFunction.BackOffFuncType.BoTiKVRPC, e);
try {
backOffer.doBackOff(BackOffFunction.BackOffFuncType.BoTiKVRPC, e);
} catch (Exception boErr) {
logger.warn(
String.format("backoff time exceed, invalidate region[%d]", recv.getRegion().getId()));
regionManager.onRequestFail(recv.getRegion());
throw boErr;
}
return true;
}

Expand Down
8 changes: 6 additions & 2 deletions src/main/java/org/tikv/common/region/AbstractRegionStoreClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ public boolean onStoreUnreachable() {
// reduce the latency cost by fail requests.
if (targetStore.canForwardFirst()) {
if (conf.getEnableGrpcForward() && retryForwardTimes <= region.getFollowerList().size()) {
return retryOtherStoreByProxyForward();
if (retryOtherStoreByProxyForward()) {
return true;
}
}
if (retryOtherStoreLeader()) {
return true;
Expand All @@ -154,7 +156,9 @@ public boolean onStoreUnreachable() {
return true;
}
if (conf.getEnableGrpcForward() && retryForwardTimes <= region.getFollowerList().size()) {
return retryOtherStoreByProxyForward();
if (retryOtherStoreByProxyForward()) {
return true;
}
}
return true;
}
Expand Down