fix(sql): restore advisory lock manager state on read-committed statement retry - #173217
Open
waterWang wants to merge 1 commit into
Open
fix(sql): restore advisory lock manager state on read-committed statement retry#173217waterWang wants to merge 1 commit into
waterWang wants to merge 1 commit into
Conversation
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? Thank you for contributing to CockroachDB. Please ensure you have followed the guidelines for creating a PR. Before a member of our team reviews your PR, I have some potential action items for you:
I have added a few people who may be able to assist in reviewing:
🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
|
This file contains hidden or 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
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.
Fixes: #173169
The read-committed per-statement retry loop in
dispatchReadCommittedStmtToExecutionEnginecreates and rolls back its savepoint directly at the KV layer without notifying the advisory lock manager. The manager hooks are only wired into the SQL SAVEPOINT statements.When a statement acquires a
pg_advisory_xact_lockand then hits a retryable error in the same statement, KV correctly rolls back the lock but the manager's stack entry survives. If the retry does not re-acquire the same lock,pg_locksreports a granted advisory lock the session does not hold for the rest of the transaction.This fix:
ExportRewindSnapshotprimitive).ApplyRewindSnapshot), keepingpg_locksconsistent with KV.The existing rewind primitives (
ExportRewindSnapshot/ApplyRewindSnapshotinpkg/sql/advisorylock/manager.go) are reused as suggested in the issue.OnSQLRollbackToSavepointcannot be used directly since the read-committed savepoint is not a SQL savepoint.