Merge pull request #6399 from yipengyin/fix-cleanup

fix(runtime-rs): add exited state to ensure cleanup

src/runtime-rs/crates/runtimes/common/src/types/mod.rs

@@ -184,6 +184,7 @@ pub enum ProcessStatus {
     Stopped = 3,
     Paused = 4,
     Pausing = 5,
+    Exited = 6,
 }
 
 #[derive(Debug, Clone)]

src/runtime-rs/crates/runtimes/common/src/types/trans_into_shim.rs

@@ -56,6 +56,7 @@ impl From<ProcessStatus> for api::Status {
             ProcessStatus::Stopped => api::Status::STOPPED,
             ProcessStatus::Paused => api::Status::PAUSED,
             ProcessStatus::Pausing => api::Status::PAUSING,
+            ProcessStatus::Exited => api::Status::STOPPED,
         }
     }
 }

src/runtime-rs/crates/runtimes/virt_container/src/container_manager/container_inner.rs

@@ -200,10 +200,11 @@ impl ContainerInner {
             return Ok(());
         }
 
-        self.check_state(vec![ProcessStatus::Running])
+        self.check_state(vec![ProcessStatus::Running, ProcessStatus::Exited])
             .await
             .context("check state")?;
 
+        if state == ProcessStatus::Running {
             // if use force mode to stop container, stop always successful
             // send kill signal to container
             // ignore the error of sending signal, since the process would
@@ -214,6 +215,7 @@ impl ContainerInner {
                     warn!(logger, "failed to signal kill. {:?}", e);
                 })
                 .ok();
+        }
 
         match process.process_type {
             ProcessType::Container => self

src/runtime-rs/crates/runtimes/virt_container/src/container_manager/process.rs

@@ -182,7 +182,7 @@ impl Process {
             drop(exit_status);
 
             let mut status = status.write().await;
-            *status = ProcessStatus::Stopped;
+            *status = ProcessStatus::Exited;
             drop(status);
 
             drop(exit_notifier);