github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-30 05:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9430 from UiPath/fix-agent-shutdown

Browse Source 
agent: shutdown vm on exit when agent is used as init process
This commit is contained in:
Xuewei Niu 2024-04-15 10:47:07 +08:00 committed by GitHub
commit 402d8a968e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/agent/src/main.rs
View File

@ -24,8 +24,9 @@ use cfg_if::cfg_if;
use clap::{AppSettings, Parser}; use clap::{AppSettings, Parser};
use const_format::concatcp; use const_format::concatcp;
use nix::fcntl::OFlag; use nix::fcntl::OFlag;
use nix::sys::reboot::{reboot, RebootMode};
use nix::sys::socket::{self, AddressFamily, SockFlag, SockType, VsockAddr}; use nix::sys::socket::{self, AddressFamily, SockFlag, SockType, VsockAddr};
use nix::unistd::{self, dup, Pid}; use nix::unistd::{self, dup, sync, Pid};
use std::env; use std::env;
use std::ffi::OsStr; use std::ffi::OsStr;
use std::fs::{self, File}; use std::fs::{self, File};
@ -179,7 +180,7 @@ async fn create_logger_task(rfd: RawFd, vsock_port: u32, shutdown: Receiver<bool
Ok(()) Ok(())
} }
async fn real_main() -> std::result::Result<(), Box<dyn std::error::Error>> { async fn real_main(init_mode: bool) -> std::result::Result<(), Box<dyn std::error::Error>> {
env::set_var("RUST_BACKTRACE", "full"); env::set_var("RUST_BACKTRACE", "full");
// List of tasks that need to be stopped for a clean shutdown // List of tasks that need to be stopped for a clean shutdown
@ -192,7 +193,6 @@ async fn real_main() -> std::result::Result<(), Box<dyn std::error::Error>> {
let (shutdown_tx, shutdown_rx) = channel(true); let (shutdown_tx, shutdown_rx) = channel(true);
let init_mode = unistd::getpid() == Pid::from_raw(1);
if init_mode { if init_mode {
// dup a new file descriptor for this temporary logger writer, // dup a new file descriptor for this temporary logger writer,
// since this logger would be dropped and it's writer would // since this logger would be dropped and it's writer would
@ -339,7 +339,15 @@ fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
.enable_all() .enable_all()
.build()?; .build()?;
rt.block_on(real_main()) let init_mode = unistd::getpid() == Pid::from_raw(1);
let result = rt.block_on(real_main(init_mode));
if init_mode {
sync();
let _ = reboot(RebootMode::RB_POWER_OFF);
}
result
} }
#[instrument] #[instrument]