kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-10 12:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10874 from hashicorp/b-fix-logline

Browse Source 
client: fix logline in group shutdown hook
This commit is contained in:
Seth Hoenig
2021-07-08 12:59:00 -05:00
committed by GitHub
parent 0f0bcdb6ed d783dc940a
commit 10f8b4e3e1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/allocrunner/groupservice_hook.go
View File

@@ -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)
}