From d783dc940ab346e115a2e25d501d3fb5a6564c76 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Thu, 8 Jul 2021 11:14:27 -0500 Subject: [PATCH] client: fix logline in group shutdown hook Fixes #10844 --- client/allocrunner/groupservice_hook.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/client/allocrunner/groupservice_hook.go b/client/allocrunner/groupservice_hook.go index 72f0e9fd9..778109e65 100644 --- a/client/allocrunner/groupservice_hook.go +++ b/client/allocrunner/groupservice_hook.go @@ -176,9 +176,8 @@ func (h *groupServiceHook) PreKill() { // implements the PreKill hook but requires the caller hold the lock func (h *groupServiceHook) preKillLocked() { - // If we have a shutdown delay deregister - // group services and then wait - // before continuing to kill tasks + // If we have a shutdown delay deregister group services and then wait + // before continuing to kill tasks. h.deregister() h.deregistered = true @@ -186,10 +185,10 @@ func (h *groupServiceHook) preKillLocked() { return } - h.logger.Debug("waiting before removing group service", "shutdown_delay", h.delay) + h.logger.Debug("delay before killing tasks", "group", h.group, "shutdown_delay", h.delay) // Wait for specified shutdown_delay - // this will block an agent from shutting down + // This will block an agent from shutting down. <-time.After(h.delay) }