github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-23 18:21:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10045 from lifupan/cleanup_container

Browse Source 
runtime-rs: container: fix the issue of missing cleanup container
This commit is contained in:
Greg Kurz 2024-07-19 16:36:04 +02:00 committed by GitHub
commit dc97f3f540
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/runtime-rs/crates/runtimes/virt_container/src/container_manager/container.rs
View File

@ -546,6 +546,18 @@ impl Container {
pub async fn spec(&self) -> oci::Spec { pub async fn spec(&self) -> oci::Spec {
self.spec.clone() self.spec.clone()
} }
pub async fn cleanup(&mut self) -> Result<()> {
let mut inner = self.inner.write().await;
let device_manager = self.resource_manager.get_device_manager().await;
inner
.cleanup_container(
self.container_id.container_id.as_str(),
true,
&device_manager,
)
.await
}
} }
fn amend_spec(spec: &mut oci::Spec, disable_guest_seccomp: bool) -> Result<()> { fn amend_spec(spec: &mut oci::Spec, disable_guest_seccomp: bool) -> Result<()> {

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

@ -177,7 +177,7 @@ impl ContainerInner {
} }
} }
async fn cleanup_container( pub(crate) async fn cleanup_container(
&mut self, &mut self,
cid: &str, cid: &str,
force: bool, force: bool,

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

@ -70,7 +70,7 @@ impl VirtContainerManager {
impl ContainerManager for VirtContainerManager { impl ContainerManager for VirtContainerManager {
#[instrument] #[instrument]
async fn create_container(&self, config: ContainerConfig, spec: oci::Spec) -> Result<PID> { async fn create_container(&self, config: ContainerConfig, spec: oci::Spec) -> Result<PID> {
let container = Container::new( let mut container = Container::new(
self.pid, self.pid,
config.clone(), config.clone(),
spec.clone(), spec.clone(),
@ -107,7 +107,14 @@ impl ContainerManager for VirtContainerManager {
} }
let mut containers = self.containers.write().await; let mut containers = self.containers.write().await;
container.create(spec).await.context("create")?; if let Err(e) = container.create(spec).await {
if let Err(inner_e) = container.cleanup().await {
warn!(sl!(), "failed to cleanup container {:?}", inner_e);
}
return Err(e);
}
containers.insert(container.container_id.to_string(), container); containers.insert(container.container_id.to_string(), container);
Ok(PID { pid: self.pid }) Ok(PID { pid: self.pid })
} }