Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

create task engine and run termination handler goroutine before warm pools polling #3078

Merged
merged 1 commit into from
Nov 4, 2021
+29 −9
Merged

create task engine and run termination handler goroutine before warm pools polling #3078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions agent/app/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,17 @@ func (agent *ecsAgent) doStart(containerChangeEventStream *eventstream.EventStre
}
}

// Create the task engine
taskEngine, currentEC2InstanceID, err := agent.newTaskEngine(containerChangeEventStream,
credentialsManager, state, imageManager, execCmdMgr)
if err != nil {
seelog.Criticalf("Unable to initialize new task engine: %v", err)
return exitcodes.ExitTerminal
}

// Start termination handler in goroutine
go agent.terminationHandler(state, agent.dataClient, taskEngine, agent.cancel)

// If part of ASG, wait until instance is being set up to go in service before registering with cluster
if agent.cfg.WarmPoolsSupport.Enabled() {
err := agent.waitUntilInstanceInService(asgLifecyclePollWait, asgLifecyclePollMax, targetLifecycleMaxRetryCount)
Expand All @@ -301,13 +312,6 @@ func (agent *ecsAgent) doStart(containerChangeEventStream *eventstream.EventStre
}
}

// Create the task engine
taskEngine, currentEC2InstanceID, err := agent.newTaskEngine(containerChangeEventStream,
credentialsManager, state, imageManager, execCmdMgr)
if err != nil {
seelog.Criticalf("Unable to initialize new task engine: %v", err)
return exitcodes.ExitTerminal
}
agent.initMetricsEngine()

loadPauseErr := agent.loadPauseContainer()
Expand Down Expand Up @@ -741,8 +745,6 @@ func (agent *ecsAgent) startAsyncRoutines(
go agent.startSpotInstanceDrainingPoller(agent.ctx, client)
}

go agent.terminationHandler(state, agent.dataClient, taskEngine, agent.cancel)

// Agent introspection api
go handlers.ServeIntrospectionHTTPEndpoint(agent.ctx, &agent.containerInstanceARN, taskEngine, agent.cfg)

Expand Down
18 changes: 18 additions & 0 deletions agent/app/agent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ func TestDoStartRegisterContainerInstanceErrorTerminal(t *testing.T) {
dockerClient: dockerClient,
mobyPlugins: mockMobyPlugins,
ec2MetadataClient: mockEC2Metadata,
terminationHandler: func(taskEngineState dockerstate.TaskEngineState, dataClient data.Client, taskEngine engine.TaskEngine, cancel context.CancelFunc) {
},
}

exitCode := agent.doStart(eventstream.NewEventStream("events", ctx),
Expand Down Expand Up @@ -284,6 +286,8 @@ func TestDoStartRegisterContainerInstanceErrorNonTerminal(t *testing.T) {
credentialProvider: aws_credentials.NewCredentials(mockCredentialsProvider),
mobyPlugins: mockMobyPlugins,
ec2MetadataClient: mockEC2Metadata,
terminationHandler: func(taskEngineState dockerstate.TaskEngineState, dataClient data.Client, taskEngine engine.TaskEngine, cancel context.CancelFunc) {
},
}

exitCode := agent.doStart(eventstream.NewEventStream("events", ctx),
Expand All @@ -305,19 +309,31 @@ func TestDoStartWarmPoolsError(t *testing.T) {
ctx, cancel := context.WithCancel(context.TODO())
// Cancel the context to cancel async routines
defer cancel()
terminationHandlerChan := make(chan bool)
terminationHandlerInvoked := false
agent := &ecsAgent{
ctx: ctx,
cfg: &cfg,
dockerClient: dockerClient,
ec2MetadataClient: mockEC2Metadata,
terminationHandler: func(taskEngineState dockerstate.TaskEngineState, dataClient data.Client, taskEngine engine.TaskEngine, cancel context.CancelFunc) {
terminationHandlerChan <- true
},
}

err := errors.New("error")
mockEC2Metadata.EXPECT().TargetLifecycleState().Return("", err).Times(targetLifecycleMaxRetryCount)

exitCode := agent.doStart(eventstream.NewEventStream("events", ctx),
credentialsManager, state, imageManager, client, execCmdMgr)

select {
case terminationHandlerInvoked = <-terminationHandlerChan:
case <-time.After(10 * time.Second):
}
assert.Equal(t, exitcodes.ExitTerminal, exitCode)
// verify that termination handler had been started before pollling
assert.True(t, terminationHandlerInvoked)
}

func TestDoStartHappyPath(t *testing.T) {
Expand Down Expand Up @@ -1258,6 +1274,8 @@ func TestRegisterContainerInstanceInvalidParameterTerminalError(t *testing.T) {
credentialProvider: aws_credentials.NewCredentials(mockCredentialsProvider),
dockerClient: dockerClient,
mobyPlugins: mockMobyPlugins,
terminationHandler: func(taskEngineState dockerstate.TaskEngineState, dataClient data.Client, taskEngine engine.TaskEngine, cancel context.CancelFunc) {
},
}

exitCode := agent.doStart(eventstream.NewEventStream("events", ctx),
Expand Down