fs2: reset cgroup.freeze to thawed when freezing fails#62
Open
yugstar wants to merge 1 commit into
Open
Conversation
f60040c to
85974cc
Compare
| ) | ||
|
|
||
| func setFreezer(dirPath string, state cgroups.FreezerState) error { | ||
| func setFreezer(dirPath string, state cgroups.FreezerState) (Err error) { |
Contributor
There was a problem hiding this comment.
we typically use retErr
Author
There was a problem hiding this comment.
Done, switched the named return to retErr.
When freezing a cgroup v2 fails after the freeze was requested (for example the freeze times out, or the confirmed state does not match), setFreezer returned the error but left cgroup.freeze set to "1", leaving the cgroup in a half-frozen state. Reset it back to "0" (thawed) on the freeze error path via a best-effort deferred write, mirroring the cgroup v1 behaviour from runc#2774. Fixes opencontainers/runc#5325 Signed-off-by: Aman Raj <aman.yug@gmail.com>
85974cc to
424b9d9
Compare
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
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.
Fixes opencontainers/runc#5325
When freezing a cgroup v2 fails after the freeze has been requested — for example the freeze times out (
waitFrozen) or the confirmed state does not match —setFreezerreturned the error but leftcgroup.freezeset to1, leaving the cgroup in a half-frozen state.This resets
cgroup.freezeback to0(thawed) on the freeze error path via a deferred best-effort write (the original error is preserved). It mirrors the existing cgroup v1 behaviour added in runc#2774, wherefs/freezer.gothaws on failure.