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

Refactor ACS attach instance ENI message handling #3765

Merged
merged 2 commits into from
Jun 29, 2023
Merged

Refactor ACS attach instance ENI message handling #3765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f27deb3
Minor refactor of existing items related to ACS ENI attachment
danehlim Jun 26, 2023
330cc25
Refactor ACS attach instance ENI message handling
danehlim Jun 26, 2023
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
14 changes: 1 addition & 13 deletions agent/acs/handler/acs_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,19 +263,6 @@ func (acsSession *session) startACSSession(client wsclient.ClientServer) error {
dataClient: acsSession.dataClient,
}

// Add handler to ack instance ENI attach message
instanceENIAttachHandler := newAttachInstanceENIHandler(
acsSession.ctx,
cfg.Cluster,
acsSession.containerInstanceARN,
client,
eniHandler,
)
instanceENIAttachHandler.start()
defer instanceENIAttachHandler.stop()

client.AddRequestHandler(instanceENIAttachHandler.handlerFunc())

manifestMessageIDAccessor := &manifestMessageIDAccessor{}

// Add TaskManifestHandler
Expand Down Expand Up @@ -314,6 +301,7 @@ func (acsSession *session) startACSSession(client wsclient.ClientServer) error {
}
responders := []wsclient.RequestResponder{
acssession.NewAttachTaskENIResponder(eniHandler, responseSender),
acssession.NewAttachInstanceENIResponder(eniHandler, responseSender),
acssession.NewHeartbeatResponder(acsSession.doctor, responseSender),
}
for _, r := range responders {
Expand Down
20 changes: 2 additions & 18 deletions agent/acs/handler/attach_eni_handler_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,13 @@ package handler
import (
"fmt"

"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"

"github.com/aws/amazon-ecs-agent/agent/data"
"github.com/aws/amazon-ecs-agent/agent/engine/dockerstate"
"github.com/aws/amazon-ecs-agent/agent/utils"
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/model/ecsacs"
apieni "github.com/aws/amazon-ecs-agent/ecs-agent/api/eni"
"github.com/aws/amazon-ecs-agent/ecs-agent/logger"
"github.com/aws/amazon-ecs-agent/ecs-agent/logger/field"
"github.com/aws/amazon-ecs-agent/ecs-agent/utils/arn"
"github.com/aws/amazon-ecs-agent/ecs-agent/wsclient"
"github.com/aws/aws-sdk-go/aws"

"github.com/cihub/seelog"
"github.com/pkg/errors"
)
Expand Down Expand Up @@ -133,14 +128,3 @@ func (eniHandler *eniHandler) removeENIAttachmentData(mac string) {
}
}
}

// sendAck sends ack for a certain ACS message
func sendAck(acsClient wsclient.ClientServer, clusterArn *string, containerInstanceArn *string, messageId *string) {
if err := acsClient.MakeRequest(&ecsacs.AckRequest{
Cluster: clusterArn,
ContainerInstance: containerInstanceArn,
MessageId: messageId,
}); err != nil {
seelog.Warnf("Failed to ack request with messageId: %s, error: %v", aws.StringValue(messageId), err)
}
}
30 changes: 16 additions & 14 deletions agent/acs/handler/attach_eni_handler_common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ import (
"testing"
"time"

"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"

"github.com/aws/amazon-ecs-agent/agent/data"
"github.com/aws/amazon-ecs-agent/agent/engine/dockerstate"
"github.com/aws/amazon-ecs-agent/ecs-agent/acs/session/testconst"
"github.com/aws/amazon-ecs-agent/ecs-agent/api/attachmentinfo"
apieni "github.com/aws/amazon-ecs-agent/ecs-agent/api/eni"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
)

const (
Expand All @@ -49,7 +51,7 @@ func testENIAckTimeout(t *testing.T, attachmentType string) {
taskEngineState := dockerstate.NewTaskEngineState()
dataClient := newTestDataClient(t)

expiresAt := time.Now().Add(time.Millisecond * waitTimeoutMillis)
expiresAt := time.Now().Add(time.Millisecond * testconst.WaitTimeoutMillis)
eniAttachment := &apieni.ENIAttachment{
AttachmentInfo: attachmentinfo.AttachmentInfo{
TaskARN: taskArn,
Expand All @@ -58,7 +60,7 @@ func testENIAckTimeout(t *testing.T, attachmentType string) {
AttachStatusSent: false,
},
AttachmentType: attachmentType,
MACAddress: randomMAC,
MACAddress: testconst.RandomMAC,
}
eniHandler := &eniHandler{
state: taskEngineState,
Expand All @@ -72,7 +74,7 @@ func testENIAckTimeout(t *testing.T, attachmentType string) {
assert.NoError(t, err)
assert.Len(t, res, 1)
for {
time.Sleep(time.Millisecond * waitTimeoutMillis)
time.Sleep(time.Millisecond * testconst.WaitTimeoutMillis)
if len(taskEngineState.(*dockerstate.DockerTaskEngineState).AllENIAttachments()) == 0 {
res, err := dataClient.GetENIAttachments()
assert.NoError(t, err)
Expand All @@ -98,7 +100,7 @@ func testENIAckWithinTimeout(t *testing.T, attachmentType string) {

taskEngineState := dockerstate.NewTaskEngineState()
dataClient := data.NewNoopClient()
expiresAt := time.Now().Add(time.Millisecond * waitTimeoutMillis)
expiresAt := time.Now().Add(time.Millisecond * testconst.WaitTimeoutMillis)
eniAttachment := &apieni.ENIAttachment{
AttachmentInfo: attachmentinfo.AttachmentInfo{
TaskARN: taskArn,
Expand All @@ -107,7 +109,7 @@ func testENIAckWithinTimeout(t *testing.T, attachmentType string) {
AttachStatusSent: false,
},
AttachmentType: attachmentType,
MACAddress: randomMAC,
MACAddress: testconst.RandomMAC,
}
eniHandler := &eniHandler{
state: taskEngineState,
Expand All @@ -117,11 +119,11 @@ func testENIAckWithinTimeout(t *testing.T, attachmentType string) {
err := eniHandler.addENIAttachmentToState(eniAttachment)
assert.NoError(t, err)
assert.Len(t, taskEngineState.(*dockerstate.DockerTaskEngineState).AllENIAttachments(), 1)
eniAttachment, ok := taskEngineState.(*dockerstate.DockerTaskEngineState).ENIByMac(randomMAC)
eniAttachment, ok := taskEngineState.(*dockerstate.DockerTaskEngineState).ENIByMac(testconst.RandomMAC)
assert.True(t, ok)
eniAttachment.SetSentStatus()

time.Sleep(time.Millisecond * waitTimeoutMillis)
time.Sleep(time.Millisecond * testconst.WaitTimeoutMillis)

assert.Len(t, taskEngineState.(*dockerstate.DockerTaskEngineState).AllENIAttachments(), 1)
}
Expand All @@ -143,7 +145,7 @@ func testHandleENIAttachment(t *testing.T, attachmentType, taskArn string) {
dataClient := newTestDataClient(t)

taskEngineState := dockerstate.NewTaskEngineState()
expiresAt := time.Now().Add(time.Millisecond * waitTimeoutMillis)
expiresAt := time.Now().Add(time.Millisecond * testconst.WaitTimeoutMillis)
eniAttachment := &apieni.ENIAttachment{
AttachmentInfo: attachmentinfo.AttachmentInfo{
TaskARN: taskArn,
Expand All @@ -152,7 +154,7 @@ func testHandleENIAttachment(t *testing.T, attachmentType, taskArn string) {
AttachStatusSent: false,
},
AttachmentType: attachmentType,
MACAddress: randomMAC,
MACAddress: testconst.RandomMAC,
}
eniHandler := &eniHandler{
state: taskEngineState,
Expand All @@ -162,11 +164,11 @@ func testHandleENIAttachment(t *testing.T, attachmentType, taskArn string) {
err := eniHandler.HandleENIAttachment(eniAttachment)
assert.NoError(t, err)
assert.Len(t, taskEngineState.(*dockerstate.DockerTaskEngineState).AllENIAttachments(), 1)
eniAttachment, ok := taskEngineState.(*dockerstate.DockerTaskEngineState).ENIByMac(randomMAC)
eniAttachment, ok := taskEngineState.(*dockerstate.DockerTaskEngineState).ENIByMac(testconst.RandomMAC)
assert.True(t, ok)
eniAttachment.SetSentStatus()

time.Sleep(time.Millisecond * waitTimeoutMillis)
time.Sleep(time.Millisecond * testconst.WaitTimeoutMillis)

assert.Len(t, taskEngineState.(*dockerstate.DockerTaskEngineState).AllENIAttachments(), 1)
res, err := dataClient.GetENIAttachments()
Expand Down Expand Up @@ -201,7 +203,7 @@ func testHandleExpiredENIAttachment(t *testing.T, attachmentType, taskArn string
ExpiresAt: expiresAt,
},
AttachmentType: attachmentType,
MACAddress: randomMAC,
MACAddress: testconst.RandomMAC,
}
eniHandler := &eniHandler{
state: taskEngineState,
Expand Down
163 changes: 0 additions & 163 deletions agent/acs/handler/attach_instance_eni_handler.go
View file
Open in desktop

This file was deleted.

Loading