release-25.4: sql/catalog/lease: accept ABORT_REASON_CLIENT_REJECT in deadline test by spilchen · Pull Request #169000 · cockroachdb/cockroach · GitHub
Skip to content

release-25.4: sql/catalog/lease: accept ABORT_REASON_CLIENT_REJECT in deadline test#169000

Open
spilchen wants to merge 1 commit intocockroachdb:release-25.4from
spilchen:blathers/backport-release-25.4-168973
Open

release-25.4: sql/catalog/lease: accept ABORT_REASON_CLIENT_REJECT in deadline test#169000
spilchen wants to merge 1 commit intocockroachdb:release-25.4from
spilchen:blathers/backport-release-25.4-168973

Conversation

@spilchen
Copy link
Copy Markdown
Contributor

Backport 1/1 commits from #168973 on behalf of @spilchen.


TestLeaseTxnDeadlineExtensionWithSession expects COMMIT to fail with RETRY_COMMIT_DEADLINE_EXCEEDED, but the txnCoordSender heartbeat can race ahead and surface ABORT_REASON_CLIENT_REJECT instead. Both prove the txn was correctly prevented from committing, so accept either.

Closes #168540

Epic: none

Release note: None


Release justification:

TestLeaseTxnDeadlineExtensionWithSession expects COMMIT to fail with
RETRY_COMMIT_DEADLINE_EXCEEDED, but the txnCoordSender heartbeat can
race ahead and surface ABORT_REASON_CLIENT_REJECT instead. Both prove
the txn was correctly prevented from committing, so accept either.

Closes cockroachdb#168540

Epic: none

Release note: None

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@spilchen spilchen requested a review from a team as a code owner April 23, 2026 20:52
@spilchen spilchen force-pushed the blathers/backport-release-25.4-168973 branch from 7073ba7 to 5544e4e Compare April 23, 2026 20:52
@blathers-crl blathers-crl Bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Apr 23, 2026
@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented Apr 23, 2026

@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io Bot commented Apr 23, 2026

Merging to release-25.4 in this repository is managed by Trunk.

  • To merge this pull request, check the box to the left or comment /trunk merge below.

After your PR is submitted to the merge queue, this comment will be automatically updated with its status. If the PR fails, failure details will also be posted here

@blathers-crl blathers-crl Bot requested a review from fqazi April 23, 2026 20:52
@blathers-crl blathers-crl Bot added backport Label PR's that are backports to older release branches T-sql-foundations SQL Foundations Team (formerly SQL Schema + SQL Sessions) labels Apr 23, 2026
@cockroach-teamcity
Copy link
Copy Markdown
Member

@blathers-crl blathers-crl Bot added the backport-test-only Used to denote the backport has only non-production changes label Apr 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Label PR's that are backports to older release branches backport-test-only Used to denote the backport has only non-production changes blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. T-sql-foundations SQL Foundations Team (formerly SQL Schema + SQL Sessions)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants