back out PreKill changes

hashicorp · Dec 2, 2021 · b99b090 · b99b090
1 parent 25fbf9f
commit b99b090
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/client/allocrunner/alloc_runner_hooks.go b/client/allocrunner/alloc_runner_hooks.go
@@ -339,7 +339,7 @@ func (ar *allocRunner) preKillHooks() {
 			ar.logger.Trace("running alloc pre shutdown hook", "name", name, "start", start)
 		}
 
-		pre.PreKill(ar.alloc)
+		pre.PreKill()
 
 		if ar.logger.IsTrace() {
 			end := time.Now()

diff --git a/client/allocrunner/groupservice_hook.go b/client/allocrunner/groupservice_hook.go
@@ -168,18 +168,18 @@ func (h *groupServiceHook) PreTaskRestart() error {
 		h.mu.Unlock()
 	}()
 
-	h.preKillLocked(nil)
+	h.preKillLocked()
 	return h.prerunLocked()
 }
 
-func (h *groupServiceHook) PreKill(alloc *structs.Allocation) {
+func (h *groupServiceHook) PreKill() {
 	h.mu.Lock()
 	defer h.mu.Unlock()
-	h.preKillLocked(alloc)
+	h.preKillLocked()
 }
 
 // implements the PreKill hook but requires the caller hold the lock
-func (h *groupServiceHook) preKillLocked(alloc *structs.Allocation) {
+func (h *groupServiceHook) preKillLocked() {
 	// If we have a shutdown delay deregister group services and then wait
 	// before continuing to kill tasks.
 	h.deregister()

diff --git a/client/allocrunner/interfaces/runner_lifecycle.go b/client/allocrunner/interfaces/runner_lifecycle.go
@@ -22,7 +22,7 @@ type RunnerPrerunHook interface {
 type RunnerPreKillHook interface {
 	RunnerHook
 
-	PreKill(*structs.Allocation)
+	PreKill()
 }
 
 // RunnerPostrunHooks are executed after calling TaskRunner.Run, even for