backport of commit 58c9f5d

hashicorp · May 2, 2022 · 157c36e · 157c36e
1 parent 9c59a5e
commit 157c36e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/nomad/drainer/draining_node.go b/nomad/drainer/draining_node.go
@@ -66,9 +66,9 @@ func (n *drainingNode) IsDone() (bool, error) {
 	}
 
 	for _, alloc := range allocs {
-		// System jobs are only stopped after a node is done draining
-		// everything else, so ignore them here.
-		if alloc.Job.Type == structs.JobTypeSystem {
+		// System and plugin jobs are only stopped after a node is
+		// done draining everything else, so ignore them here.
+		if alloc.Job.Type == structs.JobTypeSystem || alloc.Job.IsPlugin() {
 			continue
 		}
 

diff --git a/website/content/docs/commands/node/drain.mdx b/website/content/docs/commands/node/drain.mdx
@@ -71,7 +71,7 @@ capability.
 
 - `-ignore-system`: Ignore system allows the drain to complete without
   stopping system job allocations. By default system jobs (and CSI
-  plugins) are stopped last, after the `deadline` time has expired.
+  plugins) 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