Skip to content

release-25.4: kvserver: stop wrapping AbortSpan errors as ReplicaCorruptionError#168015

Merged
trunk-io[bot] merged 1 commit intocockroachdb:release-25.4from
tbg:backport25.4-167295
Apr 10, 2026
Merged

release-25.4: kvserver: stop wrapping AbortSpan errors as ReplicaCorruptionError#168015
trunk-io[bot] merged 1 commit intocockroachdb:release-25.4from
tbg:backport25.4-167295

Conversation

@tbg
Copy link
Copy Markdown
Member

@tbg tbg commented Apr 9, 2026

Backport 1/2 commits from #167295.

/cc @cockroachdb/release


AbortSpan read errors were wrapped as ReplicaCorruptionError, causing the
node to fatal via setCorruptRaftMuLocked. This was overly aggressive: a
failure to read from the AbortSpan is not indicative of replica corruption.
Transient I/O errors would crash the node instead of being returned to the
caller.

This is the last remaining production call site that produces
ReplicaCorruptionError (the split/merge trigger wrapping was removed in
#167289).

Informs: #165558
Epic: none

Release justification: Low-risk bug fix. One-line change that stops wrapping
a non-corruption error as ReplicaCorruptionError, preventing unnecessary
node crashes on transient I/O errors during AbortSpan reads.

@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented Apr 9, 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 OR fixes for serious issues. Non-production includes test-only changes, build system changes, etc. Serious issues are 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. Reference the approved ENGREQ ticket in the PR body (e.g., "Fixes ENGREQ-123").

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.

@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io Bot commented Apr 9, 2026

😎 Merged successfully - details.

@blathers-crl blathers-crl Bot added backport Label PR's that are backports to older release branches T-kv KV Team labels Apr 9, 2026
@blathers-crl
Copy link
Copy Markdown

blathers-crl Bot commented Apr 9, 2026

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
Copy Markdown
Member

This change is Reviewable

@tbg tbg changed the title release-25.4: kvserver: remove ReplicaCorruptionError release-25.4: kvserver: stop wrapping AbortSpan errors as ReplicaCorruptionError Apr 9, 2026
@tbg tbg marked this pull request as ready for review April 9, 2026 11:33
@tbg tbg requested a review from a team as a code owner April 9, 2026 11:33
This is the last remaining production call site that wraps errors as
`ReplicaCorruptionError`. A failure to read from the AbortSpan is not
indicative of replica corruption and should not crash the node.

This is a minimal fix suitable for backporting. A follow-up commit
removes the now-dead `ReplicaCorruptionError` infrastructure entirely.

Informs: cockroachdb#165558
Release note (bug fix): Fixed a bug where transient I/O errors reading
from the AbortSpan were misidentified as replica corruption, causing
the node to crash. These errors are now returned to the caller as
regular errors.
Epic: none

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@tbg tbg force-pushed the backport25.4-167295 branch from cd244ca to 23f4a65 Compare April 9, 2026 12:01
@tbg tbg requested a review from arulajmani April 9, 2026 12:30
@trunk-io trunk-io Bot merged commit a450eaa into cockroachdb:release-25.4 Apr 10, 2026
18 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 T-kv KV Team target-release-25.4.10

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants