Apply minimumCPUShare to both task and container CPU shares #3156
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
singholt
reviewed
Mar 25, 2022
| @@ -148,18 +148,13 @@ func (task *Task) buildImplicitLinuxCPUSpec() specs.LinuxCPU { | |||
| // aggregate container CPU shares when present | |||
| var taskCPUShares uint64 | |||
| for _, container := range task.Containers { | |||
| if container.CPU > 0 { | |||
| if container.CPU < minimumCPUShare { | |||
There was a problem hiding this comment.
if a task has 2 containers with no container-level CPU defined (container.CPU = 0) and no task-level CPU defined (task.CPU). then agent would set taskCPUShares to 4 but we want it to be 2?
There was a problem hiding this comment.
Yes - I believe that should be the correct behavior because we later on bump container CPU shares to 2, if the value specified in task def is smaller (or unspecified). So if you have 2 containers they will both have CPUShares=2 when passed to docker, which makes sense for the task CPU share to be 4 in that case.
singholt
approved these changes
Mar 25, 2022
fenxiong
approved these changes
Mar 25, 2022
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
taskCPUSharesis used when creating task cgroup spec. We have aminimumCPUShare(equals 2) but it currently applies to container CPU shares only (more context undercpusection of the API doc).This value should be applicable to task CPU share as well for the following reasons:
containerd/cgroupslibrary that we use.Implementation details
When add each container CPU share to task CPU share, use
minimumCPUShareif container CPU share is less than that.Testing
New tests cover the changes: unit test
Additional manual testing: applied this commit to the cgroupv2 branch, started Agent on an AL2022 instance where cgroupv2 is enabled, and verified that task with container cpu share equals 1 can be started.
Description for the changelog
Apply minimumCPUShare to both task and container CPU shares
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.