Skip to content

Conversation

@msbutler
Copy link
Collaborator

Backport 1/1 commits from #160084 on behalf of @msbutler.


The claim query should take less than a second, but we have seen it hang for
multiple hours because the underlying transaction continuously retries and
deadlocks. To prevent this, this patch causes the claim query to timeout after
a minute by default, set by the private cluster setting
jobs.registry.claim_query.timeout. The per node claim loop will try again in
the next iteration.

Informs #158976

Release note: none


Release justification:

The claim query should take less than a second, but we have seen it hang for
multiple hours because the underlying transaction continuously retries and
deadlocks. To prevent this, this patch causes the claim query to timeout after
a minute by default, set by the private cluster setting
jobs.registry.claim_query.timeout. The per node claim loop will try again in
the next iteration.

Informs cockroachdb#158976

Release note: none
@msbutler msbutler force-pushed the blathers/backport-release-25.4-160084 branch from b1435a9 to a2ccd15 Compare December 29, 2025 23:04
@msbutler msbutler requested review from a team as code owners December 29, 2025 23:04
@blathers-crl blathers-crl bot added the blathers-backport This is a backport that Blathers created automatically. label Dec 29, 2025
@msbutler msbutler removed the request for review from a team December 29, 2025 23:04
@blathers-crl blathers-crl bot added the O-robot Originated from a bot. label Dec 29, 2025
@msbutler msbutler requested a review from kev-cao December 29, 2025 23:04
@blathers-crl blathers-crl bot requested a review from dt December 29, 2025 23:04
@blathers-crl
Copy link

blathers-crl bot commented Dec 29, 2025

Thanks for opening a backport.

Before merging, please confirm that the change does not break backwards compatibility and otherwise complies with the backport policy. Include a brief release justification in the PR description explaining why the backport is appropriate. All backports must be reviewed by the TL for the owning area. While the stricter LTS policy does not yet apply, please exercise judgment and consider gating non-critical changes behind a disabled-by-default feature flag when appropriate.

@blathers-crl blathers-crl bot added backport Label PR's that are backports to older release branches T-disaster-recovery labels Dec 29, 2025
@blathers-crl
Copy link

blathers-crl bot commented Dec 29, 2025

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.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@jeffswenson jeffswenson left a comment

Choose a reason for hiding this comment

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

LGTM

@msbutler msbutler merged commit b10c501 into cockroachdb:release-25.4 Dec 31, 2025
15 of 16 checks passed
@msbutler msbutler deleted the blathers/backport-release-25.4-160084 branch December 31, 2025 12:40
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 blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. T-disaster-recovery target-release-25.4.4

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants