github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-11 14:24:11 +00:00
Code Issues Projects Releases Wiki Activity

agent: Fix container launching failure with systemd cgroup

Browse Source 
FSManager of systemd cgroup manager is responsible for setting up cgroup
path. The container launching will be failed if the FSManager is in
read-only mode.

Signed-off-by: Xuewei Niu <niuxuewei.nxw@antgroup.com>
This commit is contained in:
Xuewei Niu 2023-10-13 17:20:41 +08:00
parent 6477825195
commit b5f3a8cb39
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/agent/rustjail/src/cgroups/fs/mod.rs
View File

@ -1104,15 +1104,13 @@ impl Manager {
}) })
} }
/// Create a cgroupfs manager without creating any cgroups. /// Create a cgroupfs manager for systemd cgroup.
/// A typical case is for systemd cgroup: Systemd manager retains a /// The device cgroup is disabled in systemd cgroup, given that it is
/// cgroupfs manager to read cgroup information only. Writing cgroup /// implemented by eBPF.
/// rules is done by the systemd. That is, the cgroupfs manager runs in pub fn new_systemd(cpath: &str) -> Result<Self> {
/// read-only mode.
pub fn new_read_only(cpath: &str) -> Result<Self> {
let (paths, mounts) = Self::get_paths_and_mounts(cpath).context("Get paths and mounts")?; let (paths, mounts) = Self::get_paths_and_mounts(cpath).context("Get paths and mounts")?;
let cg = load_cgroup(cgroups::hierarchies::auto(), cpath); let cg = new_cgroup(cgroups::hierarchies::auto(), cpath)?;
Ok(Self { Ok(Self {
paths, paths,

2
src/agent/rustjail/src/cgroups/systemd/manager.rs
View File

@ -113,7 +113,7 @@ impl Manager {
let (parent_slice, unit_name) = cgroups_path.parse()?; let (parent_slice, unit_name) = cgroups_path.parse()?;
let cpath = parent_slice + "/" + &unit_name; let cpath = parent_slice + "/" + &unit_name;
let fs_manager = FsManager::new_read_only(cpath.as_str())?; let fs_manager = FsManager::new_systemd(cpath.as_str())?;
Ok(Manager { Ok(Manager {
paths: fs_manager.paths.clone(), paths: fs_manager.paths.clone(),