mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-11-23 09:21:57 +01:00
Code Issues

fix tests

Browse Source
This commit is contained in:
Travis Sturzl 2021-05-21 22:55:32 -06:00
parent f05acfdc97
commit 6d8fbae0b9
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cgroups/memory.rs
View File

@ -118,7 +118,7 @@ impl Memory {
Ok(val)
}
fn get_memory_limit(cgroup_root: &Path) -> Result<u64> {
fn get_memory_limit(cgroup_root: &Path) -> Result<i64> {
let path = cgroup_root.join(CGROUP_MEMORY_LIMIT);
let mut contents = String::new();
OpenOptions::new()
@ -130,10 +130,10 @@ impl Memory {
contents = contents.trim().to_string();
if contents == "max" {
return Ok(u64::MAX);
return Ok(i64::MAX);
}
let val = contents.parse::<u64>()?;
let val = contents.parse::<i64>()?;
Ok(val)
}
@ -215,18 +215,17 @@ impl Memory {
// see:
// https://github.com/opencontainers/runc/blob/master/libcontainer/cgroups/fs/memory.go#L89
if limit != 0 && swap != 0 {
let current_limit =
Self::get_memory_limit(cgroup_root).expect("Should load current memory limit");
let current_limit = Self::get_memory_limit(cgroup_root)?;
if swap == -1 || current_limit < swap as u64 {
Self::set_swap(swap, cgroup_root).expect("should set swap");
Self::set_memory(limit, cgroup_root).expect("should set mem");
if swap == -1 || current_limit < swap {
Self::set_swap(swap, cgroup_root)?;
Self::set_memory(limit, cgroup_root)?;
return Ok(());
}
}
Self::set_memory(limit, cgroup_root).expect("should set mem");
Self::set_swap(swap, cgroup_root).expect("should set swap");
Self::set_memory(limit, cgroup_root)?;
Self::set_swap(swap, cgroup_root)?;
Ok(())
}