update: fix --cpus writing cpuset instead of quota/period#5067
Open
kmaris wants to merge 2 commits into
Open
Conversation
Member
|
Thanks, but please sign the commit for DCO (run |
AkihiroSuda
reviewed
Jul 14, 2026
Member
There was a problem hiding this comment.
The test should not be skipped on Docker?
instead of inspect --mode=native, run IMAGE cat /sys/fs/cgroup/FILE could be used?
Author
There was a problem hiding this comment.
I updated the subtests so that the cpu update will run and check the cpu.max cgroup file. Let me know if you'd like further changes, happy to help.
The --cpus flag was incorrectly assigning opts.CpusetCpus to the CPU Cpus (cpuset) field. Persist the converted quota and period instead, matching how --cpu-quota and --cpu-period are applied. Closes containerd#5066 Signed-off-by: Kevin Maris <kevin@kmaris.net>
The test-wide require.Not(nerdtest.Docker) prevented the --cpus subtest from running. Moved the docker skipping down to the subtests that need it so the --cpus subtest will run. The cpus subtest also is changed to verify against the container cgroup files but now requires cgroup v2. Signed-off-by: Kevin Maris <kevin@kmaris.net>
Member
|
Please squash the commits, then LGTM |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The --cpus flag was incorrectly assigning opts.CpusetCpus to the CPU Cpus (cpuset) field. Persist the converted quota and period instead, matching how --cpu-quota and --cpu-period are applied.
Closes #5066