-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Track plan rejection history and automatically mark clients as ineligible #13421
Merged
Merged
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
febcf30
core: server config for plan rejection tracking
lgfa29 e343ca6
core: track and act on node plan rejections
lgfa29 5beb6a1
docs: document plan rejection tracking
lgfa29 2db5edc
changelog: addn entry for #13421
lgfa29 ff15de9
apply code review suggestions
lgfa29 67f42b8
allow enabling the node rejection tracker and limit the rate nodes ar…
lgfa29 98ad0d7
fix tests
lgfa29 620b413
fix rate limit division and add more logs
lgfa29 27e767d
website: update documention for the plan rejection tracker
lgfa29 ff8f670
core: refactor plan rejection tracker
lgfa29 bd833f9
core: add plan rejetion URL to node ineligibility event
lgfa29 fb2e761
core: use stable time FSM operation
lgfa29 f5936f0
config: use pointer for plan_rejection_tracker.enabled
lgfa29 b243d7d
test: fix pointer dereference
lgfa29 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
```release-note:improvement | ||
core: automatically mark clients with recurring plan rejections as ineligible | ||
``` | ||
|
||
```release-note:improvement | ||
metrics: emit `nomad.nomad.plan.rejection_tracker.node_score` metric for the number of times a node had a plan rejection within the past time window | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -503,6 +503,10 @@ type ServerConfig struct { | |
// This value is ignored. | ||
DefaultSchedulerConfig *structs.SchedulerConfiguration `hcl:"default_scheduler_config"` | ||
|
||
// PlanRejectionTracker configures the node plan rejection tracker that | ||
// detects potentially bad nodes. | ||
PlanRejectionTracker *PlanRejectionTracker `hcl:"plan_rejection_tracker"` | ||
|
||
// EnableEventBroker configures whether this server's state store | ||
// will generate events for its event stream. | ||
EnableEventBroker *bool `hcl:"enable_event_broker"` | ||
|
@@ -548,6 +552,53 @@ type RaftBoltConfig struct { | |
NoFreelistSync bool `hcl:"no_freelist_sync"` | ||
} | ||
|
||
// PlanRejectionTracker is used in servers to configure the plan rejection | ||
// tracker. | ||
type PlanRejectionTracker struct { | ||
// Enabled controls if the plan rejection tracker is active or not. | ||
Enabled bool `hcl:"enabled"` | ||
|
||
// NodeThreshold is the number of times a node can have plan rejections | ||
// before it is marked as ineligible. | ||
NodeThreshold int `hcl:"node_threshold"` | ||
|
||
// NodeWindow is the time window used to track active plan rejections for | ||
// nodes. | ||
NodeWindow time.Duration | ||
NodeWindowHCL string `hcl:"node_window" json:"-"` | ||
Comment on lines
+563
to
+568
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure about these names, but I wanted to hedge against us potentially needing to track plan rejections for other things, like evals or jobs. Feel free to modify them. |
||
|
||
// ExtraKeysHCL is used by hcl to surface unexpected keys | ||
ExtraKeysHCL []string `hcl:",unusedKeys" json:"-"` | ||
} | ||
|
||
func (p *PlanRejectionTracker) Merge(b *PlanRejectionTracker) *PlanRejectionTracker { | ||
if p == nil { | ||
return b | ||
} | ||
|
||
result := *p | ||
|
||
if b == nil { | ||
return &result | ||
} | ||
|
||
if b.Enabled { | ||
result.Enabled = true | ||
} | ||
|
||
if b.NodeThreshold != 0 { | ||
result.NodeThreshold = b.NodeThreshold | ||
} | ||
|
||
if b.NodeWindow != 0 { | ||
result.NodeWindow = b.NodeWindow | ||
} | ||
if b.NodeWindowHCL != "" { | ||
result.NodeWindowHCL = b.NodeWindowHCL | ||
} | ||
return &result | ||
} | ||
|
||
// Search is used in servers to configure search API options. | ||
type Search struct { | ||
// FuzzyEnabled toggles whether the FuzzySearch API is enabled. If not | ||
|
@@ -985,6 +1036,10 @@ func DefaultConfig() *Config { | |
EventBufferSize: helper.IntToPtr(100), | ||
RaftProtocol: 3, | ||
StartJoin: []string{}, | ||
PlanRejectionTracker: &PlanRejectionTracker{ | ||
NodeThreshold: 100, | ||
NodeWindow: 5 * time.Minute, | ||
}, | ||
ServerJoin: &ServerJoin{ | ||
RetryJoin: []string{}, | ||
RetryInterval: 30 * time.Second, | ||
|
@@ -1586,6 +1641,10 @@ func (s *ServerConfig) Merge(b *ServerConfig) *ServerConfig { | |
result.EventBufferSize = b.EventBufferSize | ||
} | ||
|
||
if b.PlanRejectionTracker != nil { | ||
result.PlanRejectionTracker = result.PlanRejectionTracker.Merge(b.PlanRejectionTracker) | ||
} | ||
|
||
if b.DefaultSchedulerConfig != nil { | ||
c := *b.DefaultSchedulerConfig | ||
result.DefaultSchedulerConfig = &c | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we ever want to default this to
true
we'll have to change the type to a pointer (*bool
) to differentiate unset vs explicitly-false. That shouldn't be a problem though since unlike objects sent over RPCs we never have to worry about an agent on the new version sending anil
to an agent still expecting a true or false.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point, I may as well do the work now 😄
f5936f0