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

Don't allow setting dead server last contact threshold to less than 1 minute #22040

Merged
merged 6 commits into from Jul 25, 2023
Merged

Don't allow setting dead server last contact threshold to less than 1 minute #22040

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
212f2de
Don't allow setting dead server last contact threshold to less than 1…
raskchanky Jul 24, 2023
c1099e5
add changelog
raskchanky Jul 25, 2023
1527861
document the minimum dead server last contact threshold
raskchanky Jul 25, 2023
135264e
Merge branch 'main' into autopilot-config-validation
raskchanky Jul 25, 2023
5c66187
Merge branch 'main' into autopilot-config-validation
raskchanky Jul 25, 2023
cc2c78f
adjust test with new value
raskchanky Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions vault/external_tests/raft/raft_autopilot_test.go
View file
Open in desktop
Expand Up @@ -194,6 +194,14 @@ func TestRaft_Autopilot_Configuration(t *testing.T) {
writeConfigFunc(writableConfig, true)
configCheckFunc(config)

// Check dead server last contact threshold minimum
writableConfig = map[string]interface{}{
"cleanup_dead_servers": true,
"dead_server_last_contact_threshold": "5s",
}
writeConfigFunc(writableConfig, true)
configCheckFunc(config)

// Ensure that the configuration stays across reboots
leaderCore := cluster.Cores[0]
testhelpers.EnsureCoreSealed(t, cluster.Cores[0])
Expand Down
4 changes: 4 additions & 0 deletions vault/logical_system_raft.go
View file
Open in desktop
Expand Up @@ -533,6 +533,10 @@ func (b *SystemBackend) handleStorageRaftAutopilotConfigUpdate() framework.Opera
return logical.ErrorResponse(fmt.Sprintf("min_quorum must be set when cleanup_dead_servers is set and it should at least be 3; cleanup_dead_servers: %#v, min_quorum: %#v", effectiveConf.CleanupDeadServers, effectiveConf.MinQuorum)), logical.ErrInvalidRequest
}

if effectiveConf.CleanupDeadServers && effectiveConf.DeadServerLastContactThreshold.Seconds() < 60 {
return logical.ErrorResponse(fmt.Sprintf("dead_server_last_contact_threshold should not be set to less than 1m; received: %v", deadServerLastContactThreshold)), logical.ErrInvalidRequest
}

// Persist only the user supplied fields
if persist {
entry, err := logical.StorageEntryJSON(raftAutopilotConfigurationStoragePath, config)
Expand Down