Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

release-24.3: rac2: order testingRCRange.mu before RaftMu in tests #133865

Merged
merged 1 commit into from
Oct 30, 2024
Merged

release-24.3: rac2: order testingRCRange.mu before RaftMu in tests #133865

merged 1 commit into from
Oct 30, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Oct 30, 2024 •
edited by kvoli
Loading

Backport 1/1 commits from #133686 on behalf of @kvoli.

/cc @cockroachdb/release

testingRCRange.mu was being acquired, and held before acquiring RaftMu in testingRCRange.admit(), which conflicted with different ordering (reversed). This was a test only issue with TestRangeController.

Order testingRCRange.mu before RaftMu in admit().

Fixes: #133650
Release note: None

Release justification: Test only.

@kvoli
rac2: order RaftMu before testingRCRange.mu in tests
670a2ca 
`testingRCRange.mu` was being acquired, and held before acquiring
`RaftMu` in `testingRCRange.admit()`, which conflicted with different
ordering (reversed). This was a test only issue with
`TestRangeController`.

Order `RaftMu` before `testingRCRange.mu` in `admit()`.

Fixes: #133650
Release note: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner October 30, 2024 18:04
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.3-133686 branch from 34dc277 to 670a2ca Compare October 30, 2024 18:04
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Oct 30, 2024
@blathers-crl blathers[crl]
Copy link
Author

blathers-crl bot commented Oct 30, 2024

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 Oct 30, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

sumeerbhola
sumeerbhola approved these changes Oct 30, 2024
View reviewed changes
Copy link
Collaborator

@sumeerbhola sumeerbhola left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @kvoli and @pav-kv)

@kvoli kvoli merged commit 36069d7 into release-24.3 Oct 30, 2024
20 of 21 checks passed
@kvoli kvoli deleted the blathers/backport-release-24.3-133686 branch October 30, 2024 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sumeerbhola sumeerbhola sumeerbhola approved these changes

@kvoli kvoli Awaiting requested review from kvoli

@pav-kv pav-kv Awaiting requested review from pav-kv

Assignees

@kvoli kvoli

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cockroach-teamcity @sumeerbhola @kvoli