backport of commit ed204e0

hashicorp · Oct 5, 2023 · 3c95af6 · 3c95af6
1 parent fd4a647
commit 3c95af6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.changelog/18662.txt b/.changelog/18662.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+client: prevent tasks from starting without the prestart hooks running
+```
diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go
@@ -591,6 +591,12 @@ MAIN:
 			goto RESTART
 		}
 
+		// Check for a terminal allocation once more before proceeding as the
+		// prestart hooks may have been skipped.
+		if tr.shouldShutdown() {
+			break MAIN
+		}
+
 		select {
 		case <-tr.killCtx.Done():
 			break MAIN