Merge pull request #4202 from jrasell/gh_4183

Update node-drain logging message to be clearer for operators.
hashicorp · Apr 24, 2018 · 98ed560 · 98ed560
2 parents 639662d + 805b527
commit 98ed560
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/nodes.go b/api/nodes.go
@@ -209,7 +209,7 @@ func (n *Nodes) monitorDrainNode(ctx context.Context, nodeID string, index uint6
 		}
 
 		if node.DrainStrategy == nil {
-			msg := Messagef(MonitorMsgLevelInfo, "Node %q drain complete", nodeID)
+			msg := Messagef(MonitorMsgLevelInfo, "Node %q has marked all allocations for migration", nodeID)
 			select {
 			case nodeCh <- msg:
 			case <-ctx.Done():

diff --git a/command/node_drain_test.go b/command/node_drain_test.go
@@ -222,7 +222,7 @@ func TestNodeDrainCommand_Monitor(t *testing.T) {
 	out := outBuf.String()
 	t.Logf("Output:\n%s", out)
 
-	require.Contains(out, "drain complete")
+	require.Contains(out, "marked all allocations for migration")
 	for _, a := range allocs {
 		if *a.Job.Type == "system" {
 			if strings.Contains(out, a.ID) {