github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-04 02:14:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10043 from lifupan/fix_sandbox

Browse Source 
runtime-rs : fix the issue of stop sandbox
This commit is contained in:
Fupan Li
2024-07-29 09:22:26 +08:00
committed by GitHub
parent 949ffd146a c51ba73199
commit 4fbf9d67a5
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime-rs/crates/runtimes/virt_container/src/container_manager/container_inner.rs
View File

@@ -275,6 +275,10 @@ impl ContainerInner {
signal: u32, signal: u32,
all: bool, all: bool,
) -> Result<()> { ) -> Result<()> {
if self.check_state(vec![ProcessStatus::Stopped]).await.is_ok() {
return Ok(());
}
let mut process_id: agent::ContainerProcessID = process.clone().into(); let mut process_id: agent::ContainerProcessID = process.clone().into();
if all { if all {
// force signal init process // force signal init process

11
src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs
View File

@@ -471,8 +471,15 @@ impl Sandbox for VirtSandbox {
} }
async fn stop(&self) -> Result<()> { async fn stop(&self) -> Result<()> {
info!(sl!(), "begin stop sandbox"); let mut sandbox_inner = self.inner.write().await;
self.hypervisor.stop_vm().await.context("stop vm")?;
if sandbox_inner.state != SandboxState::Stopped {
info!(sl!(), "begin stop sandbox");
self.hypervisor.stop_vm().await.context("stop vm")?;
sandbox_inner.state = SandboxState::Stopped;
info!(sl!(), "sandbox stopped");
}
Ok(()) Ok(())
} }