kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Toggle Drain allows resetting eligibility

Browse Source 
This PR allows marking a node as eligible for scheduling while toggling
drain. By default the `nomad node drain -disable` commmand will mark it
as eligible but the drainer will maintain in-eligibility.
This commit is contained in:
Alex Dadgar
2018-03-08 11:06:30 -08:00
committed by Michael Schurter
parent 5b36af9860
commit d15371405f
9 changed files with 82 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
command/agent/node_endpoint.go
View File

@@ -132,7 +132,8 @@ func (s *HTTPServer) nodeToggleDrain(resp http.ResponseWriter, req *http.Request
}
args := structs.NodeUpdateDrainRequest{
NodeID: nodeID,
NodeID: nodeID,
MarkEligible: drainRequest.MarkEligible,
}
if drainRequest.DrainSpec != nil {
args.DrainStrategy = &structs.DrainStrategy{

27
command/node_drain.go
View File

@@ -56,6 +56,11 @@ Node Drain Options:
Ignore system allows the drain to complete without stopping system job
allocations. By default system jobs are stopped last.
-keep-ineligible
Keep ineligible will maintain the node's scheduling ineligibility even if
the drain is being disabled. This is useful when an existing drain is being
cancelled but additional scheduling on the node is not desired.
-self
Set the drain status of the local node.
@@ -72,14 +77,15 @@ func (c *NodeDrainCommand) Synopsis() string {
func (c *NodeDrainCommand) AutocompleteFlags() complete.Flags {
return mergeAutocompleteFlags(c.Meta.AutocompleteFlags(FlagSetClient),
complete.Flags{
"-disable": complete.PredictNothing,
"-enable": complete.PredictNothing,
"-deadline": complete.PredictAnything,
"-force": complete.PredictNothing,
"-no-deadline": complete.PredictNothing,
"-ignore-system": complete.PredictNothing,
"-self": complete.PredictNothing,
"-yes": complete.PredictNothing,
"-disable": complete.PredictNothing,
"-enable": complete.PredictNothing,
"-deadline": complete.PredictAnything,
"-force": complete.PredictNothing,
"-no-deadline": complete.PredictNothing,
"-ignore-system": complete.PredictNothing,
"-keep-ineligible": complete.PredictNothing,
"-self": complete.PredictNothing,
"-yes": complete.PredictNothing,
})
}
@@ -100,7 +106,7 @@ func (c *NodeDrainCommand) AutocompleteArgs() complete.Predictor {
func (c *NodeDrainCommand) Run(args []string) int {
var enable, disable, force,
noDeadline, ignoreSystem, self, autoYes bool
noDeadline, ignoreSystem, keepIneligible, self, autoYes bool
var deadline string
flags := c.Meta.FlagSet("node-drain", FlagSetClient)
@@ -111,6 +117,7 @@ func (c *NodeDrainCommand) Run(args []string) int {
flags.BoolVar(&force, "force", false, "Force immediate drain")
flags.BoolVar(&noDeadline, "no-deadline", false, "Drain node with no deadline")
flags.BoolVar(&ignoreSystem, "ignore-system", false, "Do not drain system job allocations from the node")
flags.BoolVar(&keepIneligible, "keep-ineligible", false, "Do not update the nodes scheduling eligibility")
flags.BoolVar(&self, "self", false, "")
flags.BoolVar(&autoYes, "yes", false, "Automatic yes to prompts.")
@@ -252,7 +259,7 @@ func (c *NodeDrainCommand) Run(args []string) int {
}
// Toggle node draining
if _, err := client.Nodes().UpdateDrain(node.ID, spec, nil); err != nil {
if _, err := client.Nodes().UpdateDrain(node.ID, spec, !keepIneligible, nil); err != nil {
c.Ui.Error(fmt.Sprintf("Error updating drain specification: %s", err))
return 1
}