diff --git a/tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClientV4.java b/tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClientV4.java index 10a0dbe7a3..65810d8d51 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClientV4.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/txn/LockResolverClientV4.java @@ -139,6 +139,7 @@ public ResolveLockResult resolveLocks( } else { long msBeforeLockExpired = TsoUtils.untilExpired(l.getTxnID(), status.getTtl()); + logger.warn("until expired " + msBeforeLockExpired); msBeforeTxnExpired.update(msBeforeLockExpired); if (forWrite) { diff --git a/tikv-client/src/main/java/com/pingcap/tikv/txn/TxnExpireTime.java b/tikv-client/src/main/java/com/pingcap/tikv/txn/TxnExpireTime.java index 726c03c9ec..d192ee6f71 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/txn/TxnExpireTime.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/txn/TxnExpireTime.java @@ -32,6 +32,8 @@ public TxnExpireTime(boolean initialized, long txnExpire) { public void update(long lockExpire) { if (lockExpire < 0) { lockExpire = 0; + } else if (lockExpire > 1000) { + lockExpire = 1000; } if (!this.initialized) {