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-23.2: raft: re-enable config change safety #125552

Merged
merged 2 commits into from
Jun 18, 2024
Merged

release-23.2: raft: re-enable config change safety #125552

merged 2 commits into from
Jun 18, 2024

Conversation

pav-kv
Copy link
Collaborator

@pav-kv pav-kv commented Jun 12, 2024 •
edited
Loading

This PR sets the release-23.2 branch to use the CRDB fork of etcd-io/raft, for porting fixes into it, and cherry-picks cockroachdb/raft/pull/3.

Related to #124804, #124820

Epic: none
Release note: none
Release justification: fixing safety bug

@pav-kv pav-kv requested a review from a team as a code owner June 12, 2024 11:45
@blathers-crl blathers[crl]
Copy link

blathers-crl bot commented Jun 12, 2024 •
edited by pav-kv
Loading

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

@pav-kv
Copy link
Collaborator Author

pav-kv commented Jun 12, 2024

@nvanbenschoten Let's merge cockroachdb/raft#3 first, and then I will update this PR to also cherry-pick that fix.

@pav-kv
release-23.2: use raft fork
4cfbd20 
This commit set the release-23.2 branch to use the CRDB fork of
etcd-io/raft, for cherry-picking fixes into it.

Epic: none
Release note: none
@pav-kv
release-23.2: cherry-pick cockroachdb/raft/pull/3
bc95ce3 
Config changes in this raft implementation require a safety constraint:
the leader must not append a config change if it hasn't applied all
config changes in its log.

The DisableConfChangeValidation flag disables this check under the
assumption that the state machine layer provides the equivalent
guarantee. However, it is hard to argue that this is true in split
leaseholder/leader scenarios.

This commit re-enables this check, to bring the safety back. The other
two state-machine-level checks concerned with entering and leaving joint
configs can still be disabled.

Epic: none
Release note: none
nvanbenschoten
nvanbenschoten approved these changes Jun 18, 2024
View reviewed changes
Copy link
Member

@nvanbenschoten nvanbenschoten 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 4 of 4 files at r1, 4 of 4 files at r2, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @pav-kv)

@pav-kv pav-kv changed the title release-23.2: use raft fork release-23.2: raft: re-enable config change safety Jun 18, 2024
@pav-kv pav-kv merged commit 5fa3d3e into cockroachdb:release-23.2 Jun 18, 2024
5 of 6 checks passed
@pav-kv pav-kv deleted the use-raft-fork branch June 18, 2024 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nvanbenschoten nvanbenschoten nvanbenschoten approved these changes

Assignees
No one assigned
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pav-kv @cockroach-teamcity @nvanbenschoten