Fixed cgroup2 path issue in LXC-Top #4439
Conversation
|
This pull request didn't trigger Jenkins as its author isn't in the allow list. An organization member must perform one of the following:
Those commands are simple Github comments of the format: "jenkins: COMMAND" |
|
This pull request has a bunch of changes to unrelated files, you probably want to clean that up. |
|
Just cleaned up the file. I am now going to implement calling cgroup2 paths first and then cgroup afterwards. |
|
Added cgroup2 and cgroup functionality so that warnings are not encountered. If any of the cgroup2 stat calls return an error code, then we call the cgroup container statistics. |
|
The PR needs to be rebased as it's incorrectly reverting some changes now. I also think it'd be best to have each individual metric attempt cgroup2 and fallback to cgroup1 as the current logic you have will fail if you're on a system that's cgroup2 but is somehow missing swap accounting, it will then assume it's cgroup1 and will fail even more as none of those files will be found. |
|
I'll go ahead and push a commit to resolve the conflict in network.c. I must have accidentally reverted to a change before the latest commit to main that fixed a network.c issue. |
DevonSchwartz
force-pushed
the
fix-lxc-top-cgroup2
branch
from
80089a6
to
f2a6507
Compare
|
Just rebased and unstaged irrelevant file changes. |
|
Looks reasonable to me. Can you do a rebase to turn this whole thing into a single commit which also has the @mihalicyn can you review? |
DevonSchwartz
force-pushed
the
fix-lxc-top-cgroup2
branch
from
7c9aff3
to
66a94c8
Compare
Closes lxc#4376 Signed-off-by: Devon Schwartz <devon.s.schwartz@utexas.edu>
DevonSchwartz
force-pushed
the
fix-lxc-top-cgroup2
branch
from
66a94c8
to
ba823cc
Compare
Awesome! I squashed into one commit and added the closing line. |
DevonSchwartz
changed the title
We implimented some of the functionality to convert the cgroup paths to cgroup2 paths. However, we do not know how to tell whether system is using cgroup or cgroup2. In addition, some of the paths for cgroup did not have cgroup2 equivalents in the incus directory.
fix #4376