kvpb: add ConflictKey field to propagate actual conflict key#162545
Open
angles-n-daemons wants to merge 1 commit intocockroachdb:masterfrom
Open
kvpb: add ConflictKey field to propagate actual conflict key#162545angles-n-daemons wants to merge 1 commit intocockroachdb:masterfrom
angles-n-daemons wants to merge 1 commit intocockroachdb:masterfrom
Conversation
Previously, contention events incorrectly reported the anchor key (TxnMeta.Key) instead of the actual conflict key. The anchor key is where a transaction's record is stored, which is often different from the key where the conflict occurred. This change adds a ConflictKey field to TransactionRetryError and TransactionRetryWithProtoRefreshError to propagate the actual conflict key from RefreshFailedError through the error chain. The SQL layer now uses this field when recording SERIALIZATION_CONFLICT contention events. Fixes cockroachdb#125787 Release note (bug fix): Fixed a bug where contention events reported the wrong key. Previously, the key field in contention events showed the transaction's anchor key (used for record placement) rather than the actual key where the conflict occurred. This made it difficult to diagnose contention issues accurately. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Contributor
|
Merging to
|
|
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? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Member
|
This change is |
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
2 participants
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.
Previously, contention events incorrectly reported the anchor key (TxnMeta.Key) instead of the actual conflict key. The anchor key is where a transaction's record is stored, which is often different from the key where the conflict occurred.
This change adds a ConflictKey field to TransactionRetryError and TransactionRetryWithProtoRefreshError to propagate the actual conflict key from RefreshFailedError through the error chain. The SQL layer now uses this field when recording SERIALIZATION_CONFLICT contention events.
Fixes #125787
Release note (bug fix): Fixed a bug where contention events reported the wrong key. Previously, the key field in contention events showed the transaction's anchor key (used for record placement) rather than the actual key where the conflict occurred. This made it difficult to diagnose contention issues accurately.
(co-authored with claude)