containerd
/
rust-extensions
mirror of https://github.com/containerd/rust-extensions.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fmt modify

This commit is contained in:
jokemanfire 2024-01-02 19:56:51 +08:00 committed by Maksym Pavlenko
parent a9f1dcf777
commit 2236ba39d9
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/shim/src/cgroup.rs
View File

@ -217,22 +217,19 @@ pub fn update_resources(pid: u32, resources: &LinuxResources) -> Result<()> {
Subsystem::Mem(mem_ctr) => { Subsystem::Mem(mem_ctr) => {
if let Some(memory) = resources.memory() { if let Some(memory) = resources.memory() {
//if swap and limit setting have //if swap and limit setting have
match (memory.limit(), memory.swap()) { if let (Some(limit), Some(swap)) = (memory.limit(), memory.swap()) {
(Some(limit), Some(swap)) => { //get current memory_limit
//get current memory_limit let current = mem_ctr.memory_stat().limit_in_bytes;
let current = mem_ctr.memory_stat().limit_in_bytes; // if the updated swap value is larger than the current memory limit set the swap changes first
// if the updated swap value is larger than the current memory limit set the swap changes first // then set the memory limit as swap must always be larger than the current limit
// then set the memory limit as swap must always be larger than the current limit if current < swap {
if current < swap { mem_ctr
mem_ctr .set_memswap_limit(swap)
.set_memswap_limit(swap) .map_err(other_error!(e, "set memsw limit"))?;
.map_err(other_error!(e, "set memsw limit"))?; mem_ctr
mem_ctr .set_limit(limit)
.set_limit(limit) .map_err(other_error!(e, "set mem limit"))?;
.map_err(other_error!(e, "set mem limit"))?;
}
} }
_ => (),
} }
// set memory limit in bytes // set memory limit in bytes
if let Some(limit) = memory.limit() { if let Some(limit) = memory.limit() {