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.

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

release-24.1: kv: shallow copy BatchRequest on mutate in tryBumpBatchTimestamp #125576

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jun 12, 2024

Backport 1/1 commits from #124634 on behalf of @lyang24.

Fixes #125126.

/cc @cockroachdb/release


This avoids a data race on tryBumpBatchTimestamp, which was fallout from the new logging introduced in ba13697.

Fixes: #124553
Fixes: #126081

Release note: None


Release justification: fixes data race.

@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.1-124634 branch from d743b4f to dfd80e9 Compare June 12, 2024 19:47
@blathers-crl blathers-crl bot requested a review from a team June 12, 2024 19:47
@blathers-crl blathers-crl bot requested a review from a team as a code owner June 12, 2024 19:47
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jun 12, 2024
Copy link
Author

blathers-crl bot commented Jun 12, 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 and one additional
    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 12, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@yuzefovich
Copy link
Member

Should we merge this @arulajmani @nvanbenschoten? I think this would fix #126081.

@arulajmani
Copy link
Collaborator

IIRC @nvanbenschoten wanted to give this some bake time before we merge the backport; I'll defer to him on pressing merge.

This avoids a data race on tryBumpBatchTimestamp, which was fallout from the
new logging introduced in ba13697.

Fixes: #124553

Release note: None
@nvanbenschoten nvanbenschoten force-pushed the blathers/backport-release-24.1-124634 branch from dfd80e9 to fa5d7f7 Compare July 8, 2024 14:50
@nvanbenschoten nvanbenschoten merged commit 5c928e8 into release-24.1 Jul 8, 2024
19 of 20 checks passed
@nvanbenschoten nvanbenschoten deleted the blathers/backport-release-24.1-124634 branch July 8, 2024 15:13
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants