lock_resolver: support verifying primary for check_txn_status #777
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
|
This PR is now reviewable. The integration test failed because the TiKV image is not updated yet and doesn't include the latest change. It should pass tomorrow. |
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
cfzjywxk
approved these changes
May 4, 2023
txnkv/txnlock/lock_resolver.go
Outdated
| @@ -448,7 +448,11 @@ func (lr *LockResolver) resolveLocks(bo *retry.Backoffer, opts ResolveLocksOptio | |||
| var resolve func(*Lock, bool) (TxnStatus, error) | |||
| resolve = func(l *Lock, forceSyncCommit bool) (TxnStatus, error) { | |||
| status, err := lr.getTxnStatusFromLock(bo, l, callerStartTS, forceSyncCommit, detail) | |||
| if err != nil { | |||
|
|
|||
| if _, ok := errors.Cause(err).(primaryMismatch); ok && l.LockType == kvrpcpb.Op_PessimisticLock { | |||
There was a problem hiding this comment.
Maybe we could print an ERROR or FATAL log for the l.LockType != kvrpcpb.Op_PessimisticLock path since it's unexpected?
There was a problem hiding this comment.
I'll add an error here. Actually the error will be returned to TiDB, and TiDB will print it as an unknown error anyway.
There was a problem hiding this comment.
I noticed that there might be other problem about the primary when fair-locking is used...
There was a problem hiding this comment.
@MyonKeminta
The check issue for fair lock is recorded in pingcap/tidb#43540, could we merge this first?
There was a problem hiding this comment.
@MyonKeminta The check issue for fair lock is recorded in pingcap/tidb#43540, could we merge this first?
yes. lets merge it.
Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
ekexium
approved these changes
May 6, 2023
iosmanthus
added a commit
that referenced
this pull request
May 22, 2023
Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com> Co-authored-by: disksing <i@disksing.com> Co-authored-by: MyonKeminta <9948422+MyonKeminta@users.noreply.github.com> Co-authored-by: Violin <6880156+violin0622@users.noreply.github.com> Co-authored-by: Smilencer <smityz@qq.com> Co-authored-by: you06 <you1474600@gmail.com> Co-authored-by: Hu# <ihusharp@gmail.com> Co-authored-by: Connor <zbk602423539@gmail.com> Co-authored-by: zyguan <zhongyangguan@gmail.com> fix case typo in comment. (#778) fix goroutine leak (#784) fix TestRURuntimeStatsCleanUp (#787) Fix wrong resource group name for some requests (#788) resolver: support verifying primary for check_txn_status (#777) resolver: handle pessimistic locks in BatchResolveLocks (#794) resolved ts (#793) ResolveLocks for unistore (#807)
MyonKeminta
added a commit
to MyonKeminta/client-go
that referenced
this pull request
May 26, 2023
* support verifying primary for check_txn_status Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * update kvproto Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * add more failpoint usages Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * update depencency and fix test Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * Do not skip for unistore; refine logs Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * Address comments Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> --------- Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
cfzjywxk
pushed a commit
that referenced
this pull request
May 29, 2023
…777) (#819) * Update dependencies Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * lock_resolver: support verifying primary for check_txn_status (#777) * support verifying primary for check_txn_status Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * update kvproto Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * add more failpoint usages Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * update depencency and fix test Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * Do not skip for unistore; refine logs Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * Address comments Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> --------- Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * Try to trigger unit tests Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * update dependency Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * Revert "Try to trigger unit tests" This reverts commit 7a6ed8d. Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> * trigger ci Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> --------- Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com> Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref: pingcap/tidb#42937
Requires: pingcap/kvproto#1105
Requires: tikv/tikv#14637