set the default value of CpuBurst to nil instead of 0 #4211
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
lifubang
force-pushed
the
fix-update-cpu-burst
branch
3 times, most recently
from
ef2c491
to
dda00b4
Compare
AkihiroSuda
reviewed
Mar 4, 2024
update.go
Outdated
| @@ -216,7 +215,6 @@ other options are ignored. | |||
| opt string | |||
| dest *uint64 | |||
| }{ | |||
| {"cpu-burst", r.CPU.Burst}, | |||
| {"cpu-period", r.CPU.Period}, | |||
| {"cpu-rt-period", r.CPU.RealtimePeriod}, | |||
| {"cpu-share", r.CPU.Shares}, | |||
There was a problem hiding this comment.
Shouldn't we distinguish nil from zero for all the fields?
See c9ba576
There was a problem hiding this comment.
Yes, I think we should deal with all this type fields. Could you please provide your PR link?
There was a problem hiding this comment.
There was a problem hiding this comment.
ping @lifubang @kolyshkin PTAL
There was a problem hiding this comment.
cherry-picked from your PR and add a testcase.
lifubang
force-pushed
the
fix-update-cpu-burst
branch
2 times, most recently
from
de4e7a4
to
7823197
Compare
lifubang
force-pushed
the
fix-update-cpu-burst
branch
2 times, most recently
from
74f4f7a
to
9172684
Compare
Merged
|
Is this currently a draft @lifubang ? |
|
@lifubang friendly ping? :) |
In issue opencontainers#4210, if we don't provide `--cpu-burst` in `runc update`, the value of cpu burst will always set to 0. Signed-off-by: lifubang <[email protected]>
Prior to this commit, commands like `runc update --cpuset-cpus=1` were implying to set cpu burst to "0" (which does not mean "leave it as is"). This was failing when the kernel does not support cpu burst: `openat2 /sys/fs/cgroup/runc-cgroups-integration-test/test-cgroup-22167/cpu.max.burst: no such file or directory` Signed-off-by: Akihiro Suda <[email protected]>
lifubang
force-pushed
the
fix-update-cpu-burst
branch
from
9172684
to
e4bf49f
Compare
|
@kolyshkin How about merge this to fix the |
AkihiroSuda
approved these changes
Apr 3, 2024
|
I can confirm containerd tests pass now with this PR: https://github.com/containerd/containerd/actions/runs/8555412932/job/23442925228?pr=9313 |
kolyshkin
approved these changes
Apr 9, 2024
Merged
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.
Fix #4210
We should set the default of
CpuBurstto nil instead of 0 when we are updating a container's resource limit.