Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: clippy::zombie_processes #407

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −5
Draft

fix: clippy::zombie_processes #407

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af88ff8
fix(init): spawn child instead of becoming one
mkroening Dec 11, 2024
efabe9b
fix(init): `clippy::zombie_processes`
mkroening Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ fn init_stage_parent(args: SetupArgs) -> isize {
0 // Exit child process
}

fn init_stage_child(args: SetupArgs) -> ! {
fn init_stage_child(args: SetupArgs) -> isize {
let linux_spec = args.config.spec.linux().as_ref().unwrap();
debug!("Enter init_stage child");
let _ = prctl::set_name("runh:INIT");
Expand Down Expand Up @@ -611,6 +611,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
nix::unistd::close(fifo_fd).expect("Could not close exec fifo O_PATH fd!");
nix::unistd::close(init_pipe.into_raw_fd()).expect("Could not close init pipe fd!");

let mut child = None;
if args.config.is_hermit_container {
let micro_vm: u32 = env::var("RUNH_MICRO_VM")
.unwrap_or_else(|_| "0".to_string())
Expand Down Expand Up @@ -650,7 +651,7 @@ fn init_stage_child(args: SetupArgs) -> ! {
}
cmd.envs(std::env::vars());

let _child = cmd.spawn().expect("Unable to virtiofsd");
child = Some(cmd.spawn().expect("Unable to virtiofsd"));
}
}

Expand All @@ -664,8 +665,12 @@ fn init_stage_child(args: SetupArgs) -> ! {
if let Some(tap_fd) = tap_fd {
cmd.preserved_fds(vec![tap_fd]);
}
let error = cmd.exec();
let status = cmd.status().unwrap();
assert!(status.success());

//This point should not be reached on successful exec
panic!("exec failed with error {}", error)
if let Some(mut child) = child {
child.wait().unwrap();
}

0
}
Loading