libct/cgroups: switch to fscommon.{Read,Write}File#2605
Merged
Conversation
4 tasks
kolyshkin
force-pushed
the
fscommon-II
branch
from
532745f to
8376eff
Compare
AkihiroSuda
previously approved these changes
Sep 29, 2020
Contributor
Author
|
@thaJeztah PTAL |
Contributor
|
Looks good but needs rebase now. |
Contributor
Author
|
rebased |
mrunalp
previously approved these changes
Oct 1, 2020
AkihiroSuda
reviewed
Oct 2, 2020
mrunalp
previously approved these changes
Oct 3, 2020
Contributor
Author
|
Rebased, addressed latest review comments. |
Member
|
needs rebase |
This removes package dependency on cgroup, as following commits make cgroup use fscommon, which would result in dependency cycle. The code to find out memory cgroup root is not really needed, as 99% of test envrionments will have it at /sys/fs/cgroup/memory. If not, that means we're either on cgroupv2 or on some very custom system, so just skip the test. The code that checks if we're on cgroupv2 is replaced by the check of the particular v1 control file. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
fscommon.WriteFile is added specifically to work with cgroup files, and the error it returns does not need to be wrapped. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
fscommon's ReadFile and WriteFile are tailored to cgroupfs, so let's use them here. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
While at it, - change some functions to not be methods of CpusetCgroup as they don't use any members; - simplify isEmpty. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Contributor
Author
|
@AkihiroSuda @mrunalp PTAL :) |
mrunalp
approved these changes
Oct 5, 2020
AkihiroSuda
approved these changes
Oct 5, 2020
kolyshkin
pushed a commit
to kolyshkin/runc
that referenced
this pull request
Oct 6, 2020
libct/cgroups: switch to fscommon.{Read,Write}File
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
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
4 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 switches all code under libcontainer/cgroups that reads or writes cgroup files to use appropriate functions from
fscommon. This used to be part of #2598.Besides, it slightly refactors
fs/cpuset.gocode.