Skip to content

Commit

Permalink
simplify wakeup queue monitor
Browse files Browse the repository at this point in the history
  • Loading branch information
prateekchaudhry committed May 31, 2023
1 parent 539ae10 commit 880f7ba
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion agent/engine/common_integ_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ func skipIntegTestIfApplicable(t *testing.T) {
}
}

// Values in host resources from getTestHoustResources() should be looked at and CPU/Memory assigned
// Values in host resources from getTestHostResources() should be looked at and CPU/Memory assigned
// accordingly
func createTestContainerWithImageAndName(image string, name string) *apicontainer.Container {
return &apicontainer.Container{
Expand Down
4 changes: 2 additions & 2 deletions agent/engine/docker_task_engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ func (engine *DockerTaskEngine) Init(ctx context.Context) error {
return nil
}

// Always wakes up when at least on even arrives on buffered channel monitorQueuedTaskEvent
// Always wakes up when at least one event arrives on buffered channel monitorQueuedTaskEvent
// but does not block if monitorQueuedTasks is already processing queued tasks
func (engine *DockerTaskEngine) wakeUpTaskQueueMonitor() {
select {
Expand Down Expand Up @@ -914,7 +914,7 @@ func (engine *DockerTaskEngine) emitTaskEvent(task *apitask.Task, reason string)
resourcesToRelease := task.ToHostResources()
err := engine.hostResourceManager.release(task.Arn, resourcesToRelease)
if err != nil {
logger.Critical("Failed to release resources after tast stopped", logger.Fields{field.TaskARN: task.Arn})
logger.Critical("Failed to release resources after test stopped", logger.Fields{field.TaskARN: task.Arn})
}
}
event, err := api.NewTaskStateChangeEvent(task, reason)
Expand Down
2 changes: 1 addition & 1 deletion agent/engine/task_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2184,7 +2184,7 @@ func TestTaskWaitForHostResources(t *testing.T) {
hostResourceManager := NewHostResourceManager(getTestHostResources())
taskEngine := &DockerTaskEngine{
managedTasks: make(map[string]*managedTask),
monitorQueuedTaskEvent: make(chan struct{}),
monitorQueuedTaskEvent: make(chan struct{}, 1),
hostResourceManager: &hostResourceManager,
}
go taskEngine.monitorQueuedTasks(ctx)
Expand Down

0 comments on commit 880f7ba

Please sign in to comment.