Skip to content

Conversation

@stevendanna
Copy link
Collaborator

@stevendanna stevendanna commented Jan 21, 2026

Backport 1/1 commits from #147065 on behalf of @stevendanna.


Concurrent readers in the face of a concurrent, retrying writer can result in a situation where AddDiscoveredLock moves the timestamp of a held intent past the read timestamp a waiting reader. The reader should be unblocked in this case but previously wasn't, resulting in a lock table verification assertion failure in the form of:

error: non locking reader ... does not conflict with lock holder

This is my best theory for what is happening in #146749 based on increased logging. It is difficult to be certain given the required ordering of events is hard to observe with locking.

See the comment in the test for a more complete timeline that can lead to the bug.

Fixes #146749

Release note: None


Release justification: Bug fix for node crashing bug.

Concurrent readers in the face of a concurrent, retrying writer can
result in a situation where AddDiscoveredLock moves the timestamp of a
held intent past the read timestamp a waiting reader. The reader
should be unblocked in this case but previously wasn't, resulting in a
lock table verification assertion failure in the form of:

   error: non locking reader ... does not conflict with lock holder

This is my best theory for what is happening in cockroachdb#146749 based on
increased logging. It is difficult to be certain given the required
ordering of events is hard to observe with locking.

See the comment in the test for a more complete timeline that can lead
to the bug.

Fixes cockroachdb#146749

Release note: None
@stevendanna stevendanna force-pushed the blathers/backport-release-25.4-147065 branch from 64ee58d to 3ea6991 Compare January 21, 2026 14:46
@stevendanna stevendanna requested a review from a team as a code owner January 21, 2026 14:46
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jan 21, 2026
@blathers-crl
Copy link

blathers-crl bot commented Jan 21, 2026

Thanks for opening a backport.

Before merging, please confirm that it falls into one of the following categories (select one):

  • Non-production code changes. Includes test-only changes, build system changes, etc.
  • Fixes for serious issues. Defined in the policy as correctness, stability, or security issues, data corruption/loss, significant performance regressions, breaking working and widely used functionality, or an inability to detect and debug production issues.
  • Other approved changes. These changes must be gated behind a disabled-by-default feature flag unless there is a strong justification not to.

Add a brief release justification to the PR description explaining your selection.

Also, confirm that the change does not break backward compatibility and complies with all aspects of the backport policy.

All backports must be reviewed by the TL and EM for the owning area.

@blathers-crl blathers-crl bot added backport Label PR's that are backports to older release branches T-kv KV Team labels Jan 21, 2026
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@blathers-crl
Copy link

blathers-crl bot commented Jan 21, 2026

✅ PR #161505 is compliant with backport policy

Confidence: high
Critical bug criteria met: [Stability or security issues]
Backward compatible: true
Explanation: The pull request is compliant with the backport policy. It contains a 'Release justification: Bug fix for node crashing bug' line in the body, which directly addresses a critical stability issue identified by a verification assertion failure potentially leading to node crashes. These criteria justify the need for backporting as part of the critical bug criteria.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@stevendanna stevendanna merged commit dba21b6 into cockroachdb:release-25.4 Jan 22, 2026
19 checks passed
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-kv KV Team target-release-25.4.5

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants