Skip to content
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

Jump to bottom

lock_resolver: let resolve lock timeout properly #847

Merged
merged 2 commits into from
Jun 21, 2023
Merged

lock_resolver: let resolve lock timeout properly #847

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b5a9a
lock_resolver: let getTxnStatusFromLock return error when backoff tim…
zyguan Jun 20, 2023
063d9a9
Merge branch 'master' into resolve-lock-timeout
disksing Jun 21, 2023
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
1 change: 1 addition & 0 deletions txnkv/txnlock/lock_resolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@ func (lr *LockResolver) getTxnStatusFromLock(bo *retry.Backoffer, l *Lock, calle
// success before the primary region.
if err := bo.Backoff(retry.BoTxnNotFound, err); err != nil {
logutil.Logger(bo.GetCtx()).Warn("getTxnStatusFromLock backoff fail", zap.Error(err))
return TxnStatus{}, err
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I vaguely remember that this was intentionally designed in 4.0 to solve some problems, but I can't recall the details.
@MyonKeminta Do you remember?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to address some issues with resolving v4.0 optimistic mode, but it has no impact on the current default pessimistic mode. Maybe we still need to look into historical problems.

}
}
}
Expand Down