Correct path of cgroup when running a container in a container #132
Conversation
|
@Tim-Zhang Hello, take a look here? |
src/blkio.rs
Outdated
| @@ -432,6 +436,16 @@ impl BlkIoController { | |||
| /// Constructs a new `BlkIoController` with `root` serving as the root of the control group. | |||
| pub fn new(root: PathBuf, v2: bool) -> Self { | |||
| Self { | |||
| mount_root: Default::default(), | |||
There was a problem hiding this comment.
All the controllers have the exact same code pattern. Shouldn't we try to factor out that code a little more?
src/blkio.rs
Outdated
| @@ -432,6 +436,16 @@ impl BlkIoController { | |||
| /// Constructs a new `BlkIoController` with `root` serving as the root of the control group. | |||
| pub fn new(root: PathBuf, v2: bool) -> Self { | |||
| Self { | |||
| mount_root: Default::default(), | |||
There was a problem hiding this comment.
BTW, I found the base field wasn't used, was it better to use base field as the cgroup's mount root path?
aa624545345
force-pushed
the
collect-cgroup-path
branch
from
2598e36 to
8c19687
Compare
aa624545345
changed the title
Hi @aa624545345 LGTM, and you'd better fix the CI complained. Thanks. |
aa624545345
force-pushed
the
collect-cgroup-path
branch
2 times, most recently
from
1debf3c to
78509a2
Compare
Path of cgroup is wrong when running a container in a container. Use the root path of mountinfo fetched from /proc/$(shim_pid)/mountinfo to trim the path obtained from /proc/self/mountinfo. Fixes: kata-containers#131 Signed-off-by: 乔琛 10307740 <[email protected]>
aa624545345
force-pushed
the
collect-cgroup-path
branch
from
78509a2 to
4005ad8
Compare
| @@ -588,6 +589,33 @@ pub fn get_cgroups_relative_paths_by_pid(pid: u32) -> Result<HashMap<String, Str | |||
| get_cgroups_relative_paths_by_path(path) | |||
| } | |||
|
|
|||
| fn get_cgroup_destination(mut mount_root: String, pidpath: String) -> String { | |||
There was a problem hiding this comment.
the parameter mount_root and pidpath can be &str?
There was a problem hiding this comment.
Yeah, i can update it here.
| pidpath.trim_start_matches(&mount_root).to_string() | ||
| } | ||
|
|
||
| pub fn existing_path(paths: HashMap<String, String>) -> Result<HashMap<String, String>> { |
There was a problem hiding this comment.
I didn't see where this fn was called?
There was a problem hiding this comment.
This function is a public function. In my design, this function is optional, it can be called after get_cgroups_relative_paths or get_cgroups_relative_paths_by_pid for coder using this crate.
|
/test |
Issue can be found in #131