fix(pegboard): fix container runner orphaning

Author: MasterPtato

packages/edge/infra/client/container-runner/src/container.rs

@@ -1,6 +1,7 @@
 use std::{
 	fs,
 	io::{BufRead, BufReader},
+	os::unix::process::CommandExt,
 	path::Path,
 	process::{Command, Stdio},
 	sync::mpsc,
@@ -9,6 +10,7 @@ use std::{
 };
 
 use anyhow::*;
+use nix::sys::{prctl::set_pdeathsig, signal::Signal};
 use signal_hook::{consts::signal::SIGTERM, iterator::Signals};
 
 use crate::{log_shipper, throttle, MAX_LINE_BYTES};
@@ -68,15 +70,25 @@ pub fn run(
 		actor_id,
 		fs_path.display()
 	);
-	let mut runc_child = Command::new("runc")
+
+	let mut runc_child = Command::new("runc");
+	let runc_child = runc_child
 		.arg("run")
 		.arg(&actor_id)
 		.arg("-b")
 		.arg(fs_path)
 		.stdout(Stdio::piped())
-		.stderr(Stdio::piped())
-		.spawn()
-		.expect("failed to spawn runc");
+		.stderr(Stdio::piped());
+
+	let runc_child = unsafe {
+		runc_child.pre_exec(|| {
+			// Set the child to receive SIGKILL when parent dies
+			set_pdeathsig(Signal::SIGKILL)
+				.map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))
+		})
+	};
+
+	let mut runc_child = runc_child.spawn().expect("failed to spawn runc");
 	let runc_stdout = BufReader::new(runc_child.stdout.take().unwrap());
 	let runc_stderr = BufReader::new(runc_child.stderr.take().unwrap());
 

packages/edge/infra/client/manager/src/actor/setup.rs

@@ -719,7 +719,7 @@ impl Actor {
 				match Command::new("runc")
 					.arg("delete")
 					.arg("--force")
-					.arg(self.actor_id.to_string())
+					.arg(format!("{}-{}", self.actor_id, self.generation))
 					.output()
 					.await
 				{