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: kv: acquire clock reading for lease request under lock #135116

Merged
merged 3 commits into from
Nov 14, 2024
Merged

release-24.3: kv: acquire clock reading for lease request under lock #135116

merged 3 commits into from
Nov 14, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Nov 13, 2024 •
edited by nvanbenschoten
Loading

Backport 3/3 commits from #135042 on behalf of @nvanbenschoten.

/cc @cockroachdb/release

Fixes #134171.

This commit adds validation that lease construction that the min lease proposed timestamp is never in advance of the current time.

The commit then fixes a case where this could occur by acquiring a clock reading under the replica mutex in redirectOnOrAcquireLeaseForRequest.

While I was never able to reproduce the issue in TestRequestsOnLaggingReplica, I did independently and reliably hit the same issue when adding lease type changes to kvnemesis (#125260, PR to follow soon) and confirmed that this change fixes the issue.

Epic: None

Release justification: low-risk change needed for leader leases.

@nvanbenschoten
kv: assert lease sequence incremented during evaluation
88d4ee9 
This commit adds a pair of assertions near evaluation-time lease
manipulation which demonstrate why the changes to the new lease are
safe.

Epic: None
Release note: None
@nvanbenschoten
kv: don't revoke prev lease if expired when switching types
4899ccc 
Informs #134171.

This commit updates the handling of prevLeaseManipulation during lease
construction to not revoke the previous lease if it has already expired
when switching lease types. This was causing unnecessary bumps to the
MinLeaseProposedTS in tests like TestRequestsOnLaggingReplica (#134171).

Release note: None
@nvanbenschoten
kv: acquire clock reading for lease request under lock
0401c57 
Fixes #134171.

This commit adds validation that lease construction that the min
lease proposed timestamp is never in advance of the current time.

The commit then fixes a case where this could occur by acquiring
a clock reading under the replica mutex in redirectOnOrAcquireLeaseForRequest.

While I was never able to reproduce the issue in TestRequestsOnLaggingReplica,
I did independently and reliably hit the same issue when adding lease
type changes to kvnemesis (#125260, PR to follow soon) and confirmed
that this change fixes the issue.

Epic: None
@blathers-crl blathers-crl bot requested a review from a team as a code owner November 13, 2024 21:54
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.3-135042 branch from ff7b3c3 to 0401c57 Compare November 13, 2024 21:54
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 13, 2024
@blathers-crl blathers-crl bot requested a review from arulajmani November 13, 2024 21:54
@blathers-crl blathers[crl]
Copy link
Author

blathers-crl bot commented Nov 13, 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 requested review from nvanbenschoten and tbg November 13, 2024 21:54
@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Nov 13, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@tbg tbg removed their request for review November 14, 2024 07:55
@nvanbenschoten nvanbenschoten merged commit 13c52d5 into release-24.3 Nov 14, 2024
20 of 21 checks passed
@nvanbenschoten nvanbenschoten deleted the blathers/backport-release-24.3-135042 branch November 14, 2024 19:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arulajmani arulajmani arulajmani approved these changes

@nvanbenschoten nvanbenschoten Awaiting requested review from nvanbenschoten

Assignees

@nvanbenschoten nvanbenschoten

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 @arulajmani @nvanbenschoten