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

Backport of Prevent autopilot from demoting voters when they join a 2nd time into release/1.12.x #18331

Merged
merged 1 commit into from
Dec 13, 2022
Merged

Backport of Prevent autopilot from demoting voters when they join a 2nd time into release/1.12.x #18331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog/18263.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
```release-note:bug
storage/raft (enterprise): An already joined node can rejoin by wiping storage
and re-issueing a join request, but in doing so could transiently become a
non-voter. In some scenarios this resulted in loss of quorum.
```
10 changes: 5 additions & 5 deletions vault/external_tests/raft/raft_autopilot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
)

func TestRaft_Autopilot_Disable(t *testing.T) {
cluster := raftCluster(t, &RaftClusterOpts{
cluster, _ := raftCluster(t, &RaftClusterOpts{
DisableFollowerJoins: true,
InmemCluster: true,
// Not setting EnableAutopilot here.
Expand All @@ -38,7 +38,7 @@ func TestRaft_Autopilot_Disable(t *testing.T) {
}

func TestRaft_Autopilot_Stabilization_And_State(t *testing.T) {
cluster := raftCluster(t, &RaftClusterOpts{
cluster, _ := raftCluster(t, &RaftClusterOpts{
DisableFollowerJoins: true,
InmemCluster: true,
EnableAutopilot: true,
Expand Down Expand Up @@ -109,7 +109,7 @@ func TestRaft_Autopilot_Stabilization_And_State(t *testing.T) {
}

func TestRaft_Autopilot_Configuration(t *testing.T) {
cluster := raftCluster(t, &RaftClusterOpts{
cluster, _ := raftCluster(t, &RaftClusterOpts{
DisableFollowerJoins: true,
InmemCluster: true,
EnableAutopilot: true,
Expand Down Expand Up @@ -301,7 +301,7 @@ func TestRaft_Autopilot_Stabilization_Delay(t *testing.T) {
}

func TestRaft_AutoPilot_Peersets_Equivalent(t *testing.T) {
cluster := raftCluster(t, &RaftClusterOpts{
cluster, _ := raftCluster(t, &RaftClusterOpts{
InmemCluster: true,
EnableAutopilot: true,
DisableFollowerJoins: true,
Expand Down Expand Up @@ -417,7 +417,7 @@ func join(t *testing.T, core *vault.TestClusterCore, client *api.Client, cluster
// TestRaft_VotersStayVoters ensures that autopilot doesn't demote a node just
// because it hasn't been heard from in some time.
func TestRaft_VotersStayVoters(t *testing.T) {
cluster := raftCluster(t, &RaftClusterOpts{
cluster, _ := raftCluster(t, &RaftClusterOpts{
DisableFollowerJoins: true,
InmemCluster: true,
EnableAutopilot: true,
Expand Down
26 changes: 13 additions & 13 deletions vault/external_tests/raft/raft_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type RaftClusterOpts struct {
EffectiveSDKVersionMap map[int]string
}

func raftCluster(t testing.TB, ropts *RaftClusterOpts) *vault.TestCluster {
func raftCluster(t testing.TB, ropts *RaftClusterOpts) (*vault.TestCluster, *vault.TestClusterOptions) {
if ropts == nil {
ropts = &RaftClusterOpts{}
}
Expand Down Expand Up @@ -82,7 +82,7 @@ func raftCluster(t testing.TB, ropts *RaftClusterOpts) *vault.TestCluster {
cluster := vault.NewTestCluster(benchhelpers.TBtoT(t), conf, &opts)
cluster.Start()
vault.TestWaitActive(benchhelpers.TBtoT(t), cluster.Cores[0].Core)
return cluster
return cluster, &opts
}

func TestRaft_BoltDBMetrics(t *testing.T) {
Expand Down Expand Up @@ -322,7 +322,7 @@ func TestRaft_Join(t *testing.T) {

func TestRaft_RemovePeer(t *testing.T) {
t.Parallel()
cluster := raftCluster(t, nil)
cluster, _ := raftCluster(t, nil)
defer cluster.Cleanup()

for i, c := range cluster.Cores {
Expand Down Expand Up @@ -395,7 +395,7 @@ func TestRaft_NodeIDHeader(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
cluster := raftCluster(t, tc.ropts)
cluster, _ := raftCluster(t, tc.ropts)
defer cluster.Cleanup()

for i, c := range cluster.Cores {
Expand Down Expand Up @@ -432,7 +432,7 @@ func TestRaft_NodeIDHeader(t *testing.T) {

func TestRaft_Configuration(t *testing.T) {
t.Parallel()
cluster := raftCluster(t, nil)
cluster, _ := raftCluster(t, nil)
defer cluster.Cleanup()

for i, c := range cluster.Cores {
Expand Down Expand Up @@ -479,7 +479,7 @@ func TestRaft_Configuration(t *testing.T) {

func TestRaft_ShamirUnseal(t *testing.T) {
t.Parallel()
cluster := raftCluster(t, nil)
cluster, _ := raftCluster(t, nil)
defer cluster.Cleanup()

for i, c := range cluster.Cores {
Expand All @@ -491,7 +491,7 @@ func TestRaft_ShamirUnseal(t *testing.T) {

func TestRaft_SnapshotAPI(t *testing.T) {
t.Parallel()
cluster := raftCluster(t, nil)
cluster, _ := raftCluster(t, nil)
defer cluster.Cleanup()

leaderClient := cluster.Cores[0].Client
Expand Down Expand Up @@ -555,7 +555,7 @@ func TestRaft_SnapshotAPI_MidstreamFailure(t *testing.T) {
if err != nil {
t.Fatal(err)
}
cluster := raftCluster(t, &RaftClusterOpts{
cluster, _ := raftCluster(t, &RaftClusterOpts{
NumCores: 1,
Seal: autoSeal,
})
Expand Down Expand Up @@ -660,7 +660,7 @@ func TestRaft_SnapshotAPI_RekeyRotate_Backward(t *testing.T) {
tCaseLocal := tCase
t.Parallel()

cluster := raftCluster(t, &RaftClusterOpts{DisablePerfStandby: tCaseLocal.DisablePerfStandby})
cluster, _ := raftCluster(t, &RaftClusterOpts{DisablePerfStandby: tCaseLocal.DisablePerfStandby})
defer cluster.Cleanup()

leaderClient := cluster.Cores[0].Client
Expand Down Expand Up @@ -861,7 +861,7 @@ func TestRaft_SnapshotAPI_RekeyRotate_Forward(t *testing.T) {
tCaseLocal := tCase
t.Parallel()

cluster := raftCluster(t, &RaftClusterOpts{DisablePerfStandby: tCaseLocal.DisablePerfStandby})
cluster, _ := raftCluster(t, &RaftClusterOpts{DisablePerfStandby: tCaseLocal.DisablePerfStandby})
defer cluster.Cleanup()

leaderClient := cluster.Cores[0].Client
Expand Down Expand Up @@ -1048,7 +1048,7 @@ func TestRaft_SnapshotAPI_RekeyRotate_Forward(t *testing.T) {

func TestRaft_SnapshotAPI_DifferentCluster(t *testing.T) {
t.Parallel()
cluster := raftCluster(t, nil)
cluster, _ := raftCluster(t, nil)
defer cluster.Cleanup()

leaderClient := cluster.Cores[0].Client
Expand Down Expand Up @@ -1094,7 +1094,7 @@ func TestRaft_SnapshotAPI_DifferentCluster(t *testing.T) {

// Cluster 2
{
cluster2 := raftCluster(t, nil)
cluster2, _ := raftCluster(t, nil)
defer cluster2.Cleanup()

leaderClient := cluster2.Cores[0].Client
Expand Down Expand Up @@ -1141,7 +1141,7 @@ func TestRaft_SnapshotAPI_DifferentCluster(t *testing.T) {
}

func BenchmarkRaft_SingleNode(b *testing.B) {
cluster := raftCluster(b, nil)
cluster, _ := raftCluster(b, nil)
defer cluster.Cleanup()

leaderClient := cluster.Cores[0].Client
Expand Down
4 changes: 2 additions & 2 deletions vault/logical_system_raft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,9 @@ func (b *SystemBackend) handleRaftBootstrapAnswerWrite() framework.OperationFunc
var desiredSuffrage string
switch nonVoter {
case true:
desiredSuffrage = "voter"
default:
desiredSuffrage = "non-voter"
default:
desiredSuffrage = "voter"
}

if b.Core.raftFollowerStates != nil {
Expand Down