Skip to content

Optimize scan resolve lock #2094

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

Open
birdstorm wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Optimize scan resolve lock #2094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc0850c
optimize scan resolve lock
birdstorm Aug 5, 2021
c69b29d
Merge branch 'master' into optimize-scan-resolve-lock
birdstorm Sep 10, 2021
d53aae7
Merge branch 'master' into optimize-scan-resolve-lock
birdstorm Sep 11, 2021
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
2 changes: 1 addition & 1 deletion tikv-client/scripts/proto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CURRENT_DIR=`pwd`
TISPARK_HOME="$(cd "`dirname "$0"`"/../..; pwd)"
cd $TISPARK_HOME/tikv-client

kvproto_hash=6ed99a08e262d8a32d6355dcba91cf99cb92074a
kvproto_hash=62630088ebc1aabcba3038ede6e775d89d38c98b

raft_rs_hash=b9891b673573fad77ebcf9bbe0969cf945841926

Expand Down
2 changes: 1 addition & 1 deletion tikv-client/src/main/java/com/pingcap/tikv/TiConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class TiConfiguration implements Serializable {
private static final DateTimeZone DEF_TIMEZONE = Converter.getLocalTimezone();
private static final int DEF_TIMEOUT = 10;
private static final TimeUnit DEF_TIMEOUT_UNIT = TimeUnit.MINUTES;
private static final int DEF_SCAN_BATCH_SIZE = 10480;
private static final int DEF_SCAN_BATCH_SIZE = 10240;
private static final boolean DEF_IGNORE_TRUNCATE = true;
private static final boolean DEF_TRUNCATE_AS_WARNING = false;
private static final int DEF_MAX_FRAME_SIZE = 2147483647; // 2 GB
Expand Down
28 changes: 15 additions & 13 deletions tikv-client/src/main/java/com/pingcap/tikv/operation/KVErrorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,20 +320,22 @@ public boolean handleResponseError(BackOffer backOffer, RespT resp) {
boolean retry = false;

if (resp instanceof ScanResponse) {
List<KvPair> kvPairs = ((ScanResponse) resp).getPairsList();
List<Lock> locks = new ArrayList<>();
for (KvPair kvPair : kvPairs) {
if (kvPair.hasError()) {
Lock lock = AbstractLockResolverClient.extractLockFromKeyErr(kvPair.getError());
locks.add(lock);
if (((ScanResponse) resp).hasError()) {
List<KvPair> kvPairs = ((ScanResponse) resp).getPairsList();
List<Lock> locks = new ArrayList<>();
for (KvPair kvPair : kvPairs) {
if (kvPair.hasError()) {
Lock lock = AbstractLockResolverClient.extractLockFromKeyErr(kvPair.getError());
locks.add(lock);
}
}
}
if (!locks.isEmpty()) {
try {
resolveLocks(backOffer, locks);
retry = true;
} catch (KeyException e) {
logger.warn("Unable to handle KeyExceptions other than LockException", e);
if (!locks.isEmpty()) {
try {
resolveLocks(backOffer, locks);
retry = true;
} catch (KeyException e) {
logger.warn("Unable to handle KeyExceptions other than LockException", e);
}
}
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions tikv-client/src/main/java/com/pingcap/tikv/operation/iterator/ConcreteScanIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ TiRegion loadCurrentRegionToCache() throws GrpcException {
if (limit <= 0) {
currentCache = null;
} else {
int scanLimit = Math.min(limit, conf.getScanBatchSize());
try {
int scanSize = Math.min(limit, conf.getScanBatchSize());
currentCache = client.scan(backOffer, startKey, scanSize, version);
currentCache = client.scan(backOffer, startKey, scanLimit, version);
} catch (final TiKVException e) {
backOffer.doBackOff(BackOffFunction.BackOffFuncType.BoRegionMiss, e);
continue;
Expand Down