Skip to content

Conversation

@yuzefovich
Copy link
Member

Backport 1/1 commits from #148329.

/cc @cockroachdb/release


This commit fixes a bug that was added in 3bc0992. In short, in a complicated logical expression we had v1 && v2 || v3 when we wanted v1 && (v2 || v3). This allowed us to hit an index of bounds when evaluating v3, which in this concrete case could mean that we iterated over all stats and didn't find any full ones.

There are two other places with similar conditionals, and they have the correct usage of parenthesis, so I didn't change the structure overall.

Also the bug seems quite difficult to hit, so I omitted the release note.

Fixes: #148316.

Release note: None

Release justification: critical bug fix: we've seen this bug result in a failure to take a backup (#148316) since it can error out an internal query used by the backup (another example is #148414 with read-role-with-memberships internal query). In the extreme, failure to backup data can result in a data loss.

This commit fixes a bug that was added in
3bc0992. In short, in a complicated
logical expression we had `v1 && v2 || v3` when we wanted `v1 && (v2 || v3)`.
This allowed us to hit an index of bounds when evaluating `v3`, which in
this concrete case could mean that we iterated over all stats and didn't
find any full ones.

There are two other places with similar conditionals, and they have the
correct usage of parenthesis, so I didn't change the structure overall.

Also the bug seems quite difficult to hit, so I omitted the release
note.

Release note: None
@yuzefovich yuzefovich requested a review from michae2 June 17, 2025 22:31
@yuzefovich yuzefovich requested a review from a team as a code owner June 17, 2025 22:31
@blathers-crl
Copy link

blathers-crl bot commented Jun 17, 2025

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Jun 17, 2025
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@michae2 michae2 left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @yuzefovich)

@yuzefovich yuzefovich merged commit 627bcbc into cockroachdb:release-23.2 Jun 23, 2025
5 checks passed
@yuzefovich yuzefovich deleted the backport23.2-148329 branch June 23, 2025 20:29
@crl-codesys-jira crl-codesys-jira added the T-sql-queries SQL Queries Team label Aug 12, 2025
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-sql-queries SQL Queries Team target-release-23.2.29

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants