Skip to content

[fix #643] fix retry with resolvedlocks info #645

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
yegetables wants to merge 2 commits into from
Closed

[fix #643] fix retry with resolvedlocks info #645

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b516cb9
fix retry with resolvedlocks info
yegetables Aug 9, 2022
5791041
fix retry with resolvedlocks info
yegetables Aug 9, 2022
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: 6 additions & 3 deletions src/main/java/org/tikv/common/region/RegionStoreClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,11 @@ public List<KvPair> batchGet(BackOffer backOffer, List<ByteString> keys, long ve
forWrite);
BatchGetResponse resp =
callWithRetry(backOffer, TikvGrpc.getKvBatchGetMethod(), request, handler);
return handleBatchGetResponse(backOffer, resp, version);
return handleBatchGetResponse(backOffer, resp, version, keys);
}

private List<KvPair> handleBatchGetResponse(
BackOffer backOffer, BatchGetResponse resp, long version) {
BackOffer backOffer, BatchGetResponse resp, long version, List<ByteString> keys) {
boolean forWrite = false;
if (resp == null) {
this.regionManager.onRequestFail(region);
Expand All @@ -329,7 +329,10 @@ private List<KvPair> handleBatchGetResponse(
lockResolverClient.resolveLocks(backOffer, version, locks, forWrite);
addResolvedLocks(version, resolveLockResult.getResolvedLocks());
// resolveLocks already retried, just throw error to upper logic.
throw new TiKVException("locks not resolved, retry");
backOffer.doBackOff(
BackOffFunction.BackOffFuncType.BoTxnLock,
new TiKVException("locks not resolved, retry"));
return batchGet(backOffer, keys, version);
}

return codec.decodeKvPairs(resp.getPairsList());
Expand Down