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

raft: upgrade to v1.3.6 #12496

Merged
merged 2 commits into from Mar 2, 2022
Merged

raft: upgrade to v1.3.6 #12496

merged 2 commits into from Mar 2, 2022

Conversation

rboyer
Copy link
Member

@rboyer rboyer commented Mar 2, 2022

Add additional protections on the Consul side to prevent NonVoters from bootstrapping raft.

This should un-flake TestServer_Expect_NonVoters

The main change being incorporated by the upgrade is hashicorp/raft#492

Add additional protections on the Consul side to prevent NonVoters from bootstrapping raft.

This should un-flake TestServer_Expect_NonVoters
@rboyer rboyer requested a review from a team March 2, 2022 22:41
@rboyer rboyer self-assigned this Mar 2, 2022
@github-actions github-actions bot added the pr/dependencies PR specifically updates dependencies of project label Mar 2, 2022
@vercel vercel bot temporarily deployed to Preview – consul March 2, 2022 22:43 Inactive
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging March 2, 2022 22:43 Inactive
@@ -386,6 +386,11 @@ func (s *Server) maybeBootstrap() {
return
}

if s.config.ReadReplica {
Copy link
Member Author

Choose a reason for hiding this comment

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

I put this after the check above so that it'll converge on s.config.BootstrapExpect = 0 at the same time as all of the other nodes so the rest of the loop below can handle the BootstrapExpect equality check logic properly.

@rboyer rboyer merged commit 58e053c into main Mar 2, 2022
@rboyer rboyer deleted the upgrade-raft-1.3.6 branch March 2, 2022 23:00
@hc-github-team-consul-core
Copy link
Collaborator

🍒 If backport labels were added before merging, cherry-picking will start automatically.

To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/600304.

@hc-github-team-consul-core
Copy link
Collaborator

🍒❌ Cherry pick of commit 58e053c onto release/1.11.x failed! Build Log

@hc-github-team-consul-core
Copy link
Collaborator

🍒❌ Cherry pick of commit 58e053c onto release/1.10.x failed! Build Log

rboyer added a commit that referenced this pull request Mar 2, 2022
Backport of #12496 to 1.11.x

Conflicts:
- go.mod
rboyer added a commit that referenced this pull request Mar 2, 2022
Backport of #12496 to 1.10.x

Conflicts:
- go.mod
rboyer added a commit that referenced this pull request Mar 2, 2022
Backport of #12496 to 1.11.x

Conflicts:
- go.mod
rboyer added a commit that referenced this pull request Mar 2, 2022
Backport of #12496 to 1.10.x

Conflicts:
- go.mod
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/dependencies PR specifically updates dependencies of project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants