This repository was archived by the owner on Sep 29, 2025. It is now read-only.
[1.3] Cherry-pick upstream Bad CPU shares to CPU weight conversion fix #52
Conversation
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
Signed-off-by: Jared Ledvina <jared.ledvina@datadoghq.com>
Since opencontainers/cgroups v0.0.2 (commit b206a01), all stuct Resources fields are annotated with "omitempty" attribute. As a result, the loaded configuration may have Resources == nil. It is totally OK (rootless containers may have no resources configured) except since commit 6c5441e, cgroup v1 fs manager requires Resources to be set in the call to NewManager (this is a cgroup v1 deficiency, or maybe our implementation deficiency, or both). To work around this, let's add code to ensure Resources is never nil after loading from state.json. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
jaredledvina
force-pushed
the
jared.ledvina/cgroupv003-backport
branch
from
20874ee to
493ea3e
Compare
Signed-off-by: Jared Ledvina <jared.ledvina@datadoghq.com>
jaredledvina
force-pushed
the
jared.ledvina/cgroupv003-backport
branch
from
493ea3e to
3b107f2
Compare
Member
Author
|
Needed to cherry-pick a bit more, closing. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Replaces #51 - Not sure why the cherry-picks exploded exactly. This version I've manually done the bump and patches instead.
This PR cherry-picks the upstream commits from opencontainers#4785 after fixing up multiple merge-conflicts, back to 1.3.