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.

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

Add missing changes from EBS Task Attach feature branch #3965

Merged
merged 1 commit into from
Oct 16, 2023

Conversation

fierlion
Copy link
Member

@fierlion fierlion commented Oct 11, 2023

Summary

This change bridges the diff between dev and https://github.com/aws/amazon-ecs-agent/tree/feature/EBSTaskAttach
The main changes are to add the EBS resource handler to the agent, and to update the watcher's state handling.

Implementation details

The changes came from a rebase of the feature branch against dev, taking dev as desired. The changes to the watcher and to the task engine state include a couple of bugfixes to our EBS state handling, where previously there was a chance that a notification came before a successful NodeStage.

This change will allow us to start testing from dev branch rather than our feature branch.

Testing

Ran tests locally to launch 5 successive EBS-backed tasks. All tasks' EBS volume mounts succeed and tasks are started as expected.

New tests cover the changes: yes

Description for the changelog

Bugfixes for EBS Task Attach.

Does this PR include breaking model changes? If so, Have you added transformation functions?

Licensing

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

agent/ebs/watcher.go Outdated Show resolved Hide resolved
agent/ebs/watcher.go Outdated Show resolved Hide resolved
@fierlion fierlion force-pushed the fierlion/devEbsFix branch 4 times, most recently from 8b64c00 to 78b0072 Compare October 13, 2023 21:27
@fierlion fierlion changed the title [WIP don't review] add missing changes from feature branch Add missing changes from EBS Task Attach feature branch Oct 13, 2023
agent/ebs/watcher.go Outdated Show resolved Hide resolved
agent/ebs/watcher.go Outdated Show resolved Hide resolved
@@ -203,6 +203,52 @@ func TestAddPendingEBSAttachment(t *testing.T) {

}

func TestAddPendingEBSAttachmentExclusion(t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: perhaps we can add a comment on what this will be testing for. a bit unclear on what we mean by exclusion here

@fierlion fierlion merged commit 768ccc1 into aws:dev Oct 16, 2023
40 checks passed
@fierlion fierlion deleted the fierlion/devEbsFix branch October 16, 2023 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants