Skip to content

fix(sql): restore advisory lock manager state on read-committed statement retry #173217

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
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(sql): restore advisory lock manager state on read-committed statement retry #173217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions pkg/sql/conn_executor_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/server/telemetry"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/sql/appstatspb"
"github.com/cockroachdb/cockroach/pkg/sql/advisorylock"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/catsessiondata"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/colinfo"
"github.com/cockroachdb/cockroach/pkg/sql/catalog/descs"
Expand Down Expand Up @@ -2773,6 +2774,15 @@ func (ex *connExecutor) dispatchReadCommittedStmtToExecutionEngine(
if err != nil {
return err
}
// Capture the advisory lock manager state so it can be restored
// on retry. The KV savepoint rollback correctly releases the
// advisory locks, but the manager's in-memory stack is not
// notified of the read-committed savepoint since it is not a
// SQL savepoint.
var advisoryLockSnap advisorylock.RewindSnapshot
if mgr := ex.extraTxnState.advisoryLockManager.Load(); mgr != nil {
advisoryLockSnap = mgr.ExportRewindSnapshot()
}

// Use retry with exponential backoff and full jitter to reduce collisions for
// high-contention workloads. See https://en.wikipedia.org/wiki/Exponential_backoff and
Expand Down Expand Up @@ -2855,6 +2865,12 @@ func (ex *connExecutor) dispatchReadCommittedStmtToExecutionEngine(
if err := ex.state.mu.txn.RollbackToSavepoint(ctx, readCommittedSavePointToken); err != nil {
return err
}
// Restore the advisory lock manager state to what it was before
// the statement executed, since the KV savepoint rollback has
// released the advisory locks but the manager was not notified.
if mgr := ex.extraTxnState.advisoryLockManager.Load(); mgr != nil {
mgr.ApplyRewindSnapshot(advisoryLockSnap)
}
if err := ex.state.mu.txn.PrepareForPartialRetry(ctx); err != nil {
return err
}
Expand Down