diff --git a/client/allocrunner/task_hook_coordinator.go b/client/allocrunner/task_hook_coordinator.go index 46b1bc30d80e..09f90d22d673 100644 --- a/client/allocrunner/task_hook_coordinator.go +++ b/client/allocrunner/task_hook_coordinator.go @@ -29,8 +29,8 @@ type taskHookCoordinator struct { prestartSidecar map[string]struct{} prestartEphemeral map[string]struct{} - mainTasksRunning map[string]struct{} // poststop: main tasks running -> finished - mainTasksPending map[string]struct{} // poststart: main tasks pending -> running + mainTasksRunning map[string]struct{} // poststop: main tasks running -> finished + mainTasksPending map[string]struct{} // poststart: main tasks pending -> running } func newTaskHookCoordinator(logger hclog.Logger, tasks []*structs.Task) *taskHookCoordinator { diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go index 8100f287c855..dabe6924922a 100644 --- a/nomad/structs/structs.go +++ b/nomad/structs/structs.go @@ -3279,7 +3279,7 @@ func (a *AllocatedResources) Comparable() *ComparableResources { prestartSidecarTasks := &AllocatedTaskResources{} prestartEphemeralTasks := &AllocatedTaskResources{} main := &AllocatedTaskResources{} - poststartTasks := &AllocatedTaskResources{} + poststopTasks := &AllocatedTaskResources{} for taskName, r := range a.Tasks { lc := a.TaskLifecycles[taskName] @@ -3292,13 +3292,13 @@ func (a *AllocatedResources) Comparable() *ComparableResources { prestartEphemeralTasks.Add(r) } } else if lc.Hook == TaskLifecycleHookPoststop { - poststartTasks.Add(r) + poststopTasks.Add(r) } } // update this loop to account for lifecycle hook prestartEphemeralTasks.Max(main) - prestartEphemeralTasks.Max(poststartTasks) + prestartEphemeralTasks.Max(poststopTasks) prestartSidecarTasks.Add(prestartEphemeralTasks) c.Flattened.Add(prestartSidecarTasks) @@ -4906,7 +4906,7 @@ func (d *DispatchPayloadConfig) Validate() error { const ( TaskLifecycleHookPrestart = "prestart" TaskLifecycleHookPoststart = "poststart" - TaskLifecycleHookPoststop = "poststop" + TaskLifecycleHookPoststop = "poststop" ) type TaskLifecycleConfig struct {