-
Notifications
You must be signed in to change notification settings - Fork 619
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 integ tests for task accounting #3741
Merged
prateekchaudhry
merged 1 commit into
aws:feature/task-resource-accounting
from
prateekchaudhry:taskAccountingIntegTests
Jun 9, 2023
Merged
Add integ tests for task accounting #3741
prateekchaudhry
merged 1 commit into
aws:feature/task-resource-accounting
from
prateekchaudhry:taskAccountingIntegTests
Jun 9, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
prateekchaudhry
force-pushed
the
taskAccountingIntegTests
branch
from
June 8, 2023 18:31
355c306
to
aba476f
Compare
prateekchaudhry
force-pushed
the
taskAccountingIntegTests
branch
2 times, most recently
from
June 8, 2023 19:13
29164ed
to
bb70e50
Compare
prateekchaudhry
force-pushed
the
taskAccountingIntegTests
branch
from
June 8, 2023 20:47
bb70e50
to
dbb57e1
Compare
prateekchaudhry
force-pushed
the
taskAccountingIntegTests
branch
from
June 8, 2023 20:50
dbb57e1
to
c65c574
Compare
Yiyuanzzz
approved these changes
Jun 8, 2023
prateekchaudhry
commented
Jun 9, 2023
@@ -109,7 +109,6 @@ func TestPostUnmarshalWindowsCanonicalPaths(t *testing.T) { | |||
}, | |||
}, | |||
}, | |||
StartSequenceNumber: 42, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This field has been removed as part of #3723
prateekchaudhry
commented
Jun 9, 2023
@@ -36,7 +36,7 @@ func TestLoadsDataForGMSATask(t *testing.T) { | |||
defer cleanup() | |||
|
|||
cfg := &config.Config{DataDir: filepath.Join(".", "testdata", "v26", "gmsa")} | |||
taskEngine := engine.NewTaskEngine(&config.Config{}, nil, nil, nil, nil, dockerstate.NewTaskEngineState(), nil, nil, nil, nil) | |||
taskEngine := engine.NewTaskEngine(&config.Config{}, nil, nil, nil, nil, nil, dockerstate.NewTaskEngineState(), nil, nil, nil, nil) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The signature here changed as part of #3684
mythri-garaga
approved these changes
Jun 9, 2023
prateekchaudhry
added a commit
that referenced
this pull request
Jun 21, 2023
prateekchaudhry
added a commit
that referenced
this pull request
Jun 22, 2023
Merged
sparrc
added a commit
to sparrc/amazon-ecs-agent
that referenced
this pull request
Jun 30, 2023
This reverts commit 2d30365.
prateekchaudhry
added a commit
that referenced
this pull request
Jul 12, 2023
prateekchaudhry
added a commit
to prateekchaudhry/amazon-ecs-agent
that referenced
this pull request
Jul 12, 2023
This reverts commit 61ad010.
prateekchaudhry
added a commit
that referenced
this pull request
Jul 12, 2023
* Revert "Revert "host resource manager initialization"" This reverts commit dafb967. * Revert "Revert "Add method to get host resources reserved for a task (#3706)"" This reverts commit 8d824db. * Revert "Revert "Add host resource manager methods (#3700)"" This reverts commit bec1303. * Revert "Revert "Remove task serialization and use host resource manager for task resources (#3723)"" This reverts commit cb54139. * Revert "Revert "add integ tests for task accounting (#3741)"" This reverts commit 61ad010. * Revert "Revert "Change reconcile/container update order on init and waitForHostResources/emitCurrentStatus order (#3747)"" This reverts commit 60a3f42. * Revert "Revert "Dont consume host resources for tasks getting STOPPED while waiting in waitingTasksQueue (#3750)"" This reverts commit 8943792.
Realmonia
pushed a commit
that referenced
this pull request
Jul 20, 2023
* Revert reverted changes for task resource accounting (#3796) * Revert "Revert "host resource manager initialization"" This reverts commit dafb967. * Revert "Revert "Add method to get host resources reserved for a task (#3706)"" This reverts commit 8d824db. * Revert "Revert "Add host resource manager methods (#3700)"" This reverts commit bec1303. * Revert "Revert "Remove task serialization and use host resource manager for task resources (#3723)"" This reverts commit cb54139. * Revert "Revert "add integ tests for task accounting (#3741)"" This reverts commit 61ad010. * Revert "Revert "Change reconcile/container update order on init and waitForHostResources/emitCurrentStatus order (#3747)"" This reverts commit 60a3f42. * Revert "Revert "Dont consume host resources for tasks getting STOPPED while waiting in waitingTasksQueue (#3750)"" This reverts commit 8943792. * fix memory resource accounting for multiple containers in single task (#3782) * fix memory resource accounting for multiple containers * change unit tests for multiple containers, add unit test for awsvpc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR adds integ tests for task resource accounting
TestHostResourceManagerTrickleQueue
- This test covers the task queuing, waiting and dequeuing behavior based on resource availability for tasks. Tasks are scheduled one after the other with small time gaps, and behavior of expected events verified.TestHostResourceManagerResourceUtilization
- This test verifies that new tasks get queued up and dequeued immediately if resources are available, and do not wait for alreadySTOPPING
tasks (knownStatus=RUNNING/desiredStatus=STOPPED) to go toSTOPPED
- which was the previous behavior with task serialization. A task is scheduled and stopped such that it goes into (knownStatus=RUNNING/desiredStatus=STOPPED) state using trap handler for SIGTERM. Then a new task is started and behavior is verified.Also made some comment clarification and added some details about task queuing and reconciliation
Testing
Verified that new introduced tests succeed
Related PRs
Related Containers Roadmap Issue
aws/containers-roadmap#325
Description for the changelog
Add integ tests for task accounting
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.