get rid of cgroupPaths for v2 case#2374
Closed
kolyshkin wants to merge 4 commits into
Closed
Conversation
By the time GetUnifiedPath() is called, path should already be set. Remove the second argument and simplify the callers. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
The setnsProcess.cgroupPaths map is used by (*setnsProcess).start to enter the cgroups. Since in case of cgroupv2 unified hierarchy there is only one cgroup to enter, let's create a map with a single element in it. As key does not matter it is empty. As a side effect, we won't write the pid into the same file 7 times :) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
In case of cgroupv2 unified hierarchy, let's use a map with a single element, with an empty string key and a unified path as the value. Modify the test case accordingly. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Since the previous commit, there are no more users of GetPaths for cgroupv2 unified hierarchy mode. We can't remove these methods without differentiating between v1 and v2 cgroup managers, so let's make them panic to make sure they are not called for v1. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Contributor
Author
|
There is one last user of GetPaths() for v2, it's |
kolyshkin
changed the title
Contributor
Author
|
No longer a WIP, ready for review. |
AkihiroSuda
requested changes
May 5, 2020
| // GetUnifiedPath panics when running in hybrid mode as well as | ||
| // in legacy mode. | ||
| GetUnifiedPath() (string, error) | ||
| GetUnifiedPath() string |
Contributor
Author
|
Replaced by #2386 |
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.
This patchset fixes the remaining users of GetPaths() in v2 mode, and makes it panic for v2 controllers.
Similarly, make
GetUnifiedPath()panic for v1 controllers since it must not be used in this case.