Unverified Commit c89b2f8c authored by Preetha Appan's avatar Preetha Appan
Browse files

fix bug where disabling a node drain when there is no drain strategy set...

fix bug where disabling a node drain when there is no drain strategy set causes scheduling eligibility to stay ineligible
Showing with 1 addition and 3 deletions
+1 -3
......@@ -498,9 +498,7 @@ func (n *Node) UpdateDrain(args *structs.NodeUpdateDrainRequest,
// Construct the node event
args.NodeEvent = structs.NewNodeEvent().SetSubsystem(structs.NodeEventSubsystemDrain)
if node.DrainStrategy == nil && args.DrainStrategy == nil {
return nil // Nothing to do
} else if node.DrainStrategy == nil && args.DrainStrategy != nil {
if node.DrainStrategy == nil && args.DrainStrategy != nil {
args.NodeEvent.SetMessage(NodeDrainEventDrainSet)
} else if node.DrainStrategy != nil && args.DrainStrategy != nil {
args.NodeEvent.SetMessage(NodeDrainEventDrainUpdated)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment