Skip to content

Commit

Permalink
lifecycle: fix typo & linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
jazzyfresh committed Nov 11, 2020
1 parent 1757eea commit 758ca14
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions client/allocrunner/task_hook_coordinator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions nomad/structs/structs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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)

Expand Down Expand Up @@ -4906,7 +4906,7 @@ func (d *DispatchPayloadConfig) Validate() error {
const (
TaskLifecycleHookPrestart = "prestart"
TaskLifecycleHookPoststart = "poststart"
TaskLifecycleHookPoststop = "poststop"
TaskLifecycleHookPoststop = "poststop"
)

type TaskLifecycleConfig struct {
Expand Down

0 comments on commit 758ca14

Please sign in to comment.