mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-04 13:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(zone-exec): ensure that the underlying process is killed when rpc is closed (#361)

Browse Source
This commit is contained in:
Alex Zenla
2024-08-25 00:07:37 -07:00
committed by GitHub
parent 41aa1aa707
commit 96ccbd50bb
6 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/zone/Cargo.toml
View File

@ -29,6 +29,7 @@ serde_json = { workspace = true }
sys-mount = { workspace = true }
sysinfo = { workspace = true }
tokio = { workspace = true }
tokio-util = { workspace = true }
[lib]
name = "kratazone"

52
crates/zone/src/exec.rs
View File

@ -1,5 +1,6 @@
use std::{collections::HashMap, process::Stdio};
use crate::childwait::ChildWait;
use anyhow::{anyhow, Result};
use krata::idm::{
client::IdmClientStreamResponseHandle,
@ -16,9 +17,9 @@ use tokio::{
io::{AsyncReadExt, AsyncWriteExt},
join,
process::Command,
select,
};
use crate::childwait::ChildWait;
use tokio_util::sync::CancellationToken;
pub struct ZoneExecTask {
pub wait: ChildWait,
@ -111,9 +112,12 @@ impl ZoneExecTask {
}
});
let cancel = CancellationToken::new();
let stdin_cancel = cancel.clone();
let stdin_task = tokio::task::spawn(async move {
loop {
let Some(request) = receiver.recv().await else {
stdin_cancel.cancel();
break;
};
@ -136,15 +140,28 @@ impl ZoneExecTask {
});
code = loop {
if let Ok(event) = wait_subscription.recv().await {
if event.pid.as_raw() as u32 == pid {
break event.status;
select! {
result = wait_subscription.recv() => match result {
Ok(event) => {
if event.pid.as_raw() as u32 == pid {
child.kill = false;
break event.status;
}
}
_ => {
child.inner.start_kill()?;
child.kill = false;
break -1;
}
},
_ = cancel.cancelled() => {
child.inner.start_kill()?;
child.kill = false;
break -1;
}
}
};
child.kill = false;
let _ = join!(pty_read_task);
stdin_task.abort();
} else {
@ -221,9 +238,12 @@ impl ZoneExecTask {
}
});
let cancel = CancellationToken::new();
let stdin_cancel = cancel.clone();
let stdin_task = tokio::task::spawn(async move {
loop {
let Some(request) = receiver.recv().await else {
stdin_cancel.cancel();
break;
};
@ -247,9 +267,21 @@ impl ZoneExecTask {
});
code = loop {
if let Ok(event) = wait_subscription.recv().await {
if event.pid.as_raw() as u32 == pid {
break event.status;
select! {
result = wait_subscription.recv() => match result {
Ok(event) => {
if event.pid.as_raw() as u32 == pid {
break event.status;
}
}
_ => {
child.start_kill()?;
break -1;
}
},
_ = cancel.cancelled() => {
child.start_kill()?;
break -1;
}
}
};