github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-29 04:51:34 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Fix stop after cloud_hypervisor exit issue

Browse Source 
Got an issue is set a wrong firmware to cloud_hypervisor.  Then the kata shim
will not exit after this fail.

This commit to fix this issue with check if cloud hypervisor is running
before call cloud_hypervisor_vmm_shutdown.
And set timeout with call cloud_hypervisor_vmm_shutdown.

Fixes: #10907

Signed-off-by: Hui Zhu <teawater@antgroup.com>
This commit is contained in:
Hui Zhu 2025-02-20 11:17:55 +08:00
parent 601c403603
commit 33908867b3
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/runtime-rs/crates/hypervisor/src/ch/inner_hypervisor.rs
View File

@ -41,7 +41,7 @@ use tokio::process::{Child, Command};
use tokio::sync::watch::Receiver;
use tokio::task;
use tokio::task::JoinHandle;
use tokio::time::Duration;
use tokio::time::{self, Duration};
use tokio::{io::AsyncBufReadExt, sync::mpsc};
const CH_NAME: &str = "cloud-hypervisor";
@ -405,18 +405,37 @@ impl CloudHypervisorInner {
Ok(())
}
async fn cloud_hypervisor_shutdown(&mut self) -> Result<()> {
let socket = self
.api_socket
.as_ref()
.ok_or("missing socket")
fn cloud_hypervisor_is_running(&self) -> Result<bool> {
let pid = self
.pid
.ok_or(format!("{} missing PID", CH_NAME))
.map_err(|e| anyhow!(e))?;
let proc_path = format!("/proc/{}", pid);
let path = Path::new(&proc_path);
Ok(fs::metadata(path).is_ok())
}
let response =
cloud_hypervisor_vmm_shutdown(socket.try_clone().context("shutdown failed")?).await?;
async fn cloud_hypervisor_shutdown(&mut self) -> Result<()> {
if self.cloud_hypervisor_is_running()? {
let socket = self
.api_socket
.as_ref()
.ok_or("missing socket")
.map_err(|e| anyhow!(e))?;
if let Some(detail) = response {
debug!(sl!(), "shutdown response: {:?}", detail);
let response = time::timeout(
Duration::from_secs(5),
cloud_hypervisor_vmm_shutdown(socket.try_clone().context("shutdown failed")?),
)
.await
.context("cloud_hypervisor_vmm_shutdown timeout")?
.context("cloud_hypervisor_vmm_shutdown")?;
if let Some(detail) = response {
debug!(sl!(), "shutdown response: {:?}", detail);
}
} else {
info!(sl!(), "{} not running", CH_NAME);
}
// Trigger a controlled shutdown