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.3: raft: ensure leaderMaxSupported does not regress when bumping terms #134270

Merged
merged 1 commit into from
Nov 6, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Nov 5, 2024

Backport 1/1 commits from #133873 on behalf of @arulajmani.

/cc @cockroachdb/release


Previously, it was possible for a leader to regress leaderMaxSupported by calling an election at a higher term. This was because we weren't careful to recognize this case on the leader, and followers had special case handling that allowed a leader to override inFortifyLease. Together, this could cause lease regressions for LeaderLeases in some rare cases.

This patch fixes this issue by removing special case handling in inFortifyLease. We also remove a special case in the handling of MsgHup which allowed a leader to step down and campaign without de-fortifying itself.

Fixes #133764

Release note: None


Release justification: Fixes a GA blocker.

@blathers-crl blathers-crl bot requested a review from a team as a code owner November 5, 2024 03:41
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.3-133873 branch from 3e7dfca to 7898c94 Compare November 5, 2024 03:41
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 5, 2024
Copy link
Author

blathers-crl bot commented Nov 5, 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 Nov 5, 2024
@blathers-crl blathers-crl bot requested a review from nvanbenschoten November 5, 2024 03:41
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Previously, it was possible for a leader to regress leaderMaxSupported
by calling an election at a higher term. This was because we weren't
careful to recognize this case on the leader, and followers had special
case handling that allowed a leader to override `inFortifyLease`.
Together, this could cause lease regressions for LeaderLeases in some
rare cases.

This patch fixes this issue by removing special case handling in
`inFortifyLease`. We also remove a special case in the handling of
`MsgHup` which allowed a leader to step down and campaign without
de-fortifying itself.

Fixes #133764

Release note: None
@arulajmani arulajmani force-pushed the blathers/backport-release-24.3-133873 branch from 7898c94 to d4b60cd Compare November 6, 2024 16:59
@arulajmani arulajmani merged commit 69d293a into release-24.3 Nov 6, 2024
20 of 21 checks passed
@arulajmani arulajmani deleted the blathers/backport-release-24.3-133873 branch November 6, 2024 19:28
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.

2 participants