Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

youki exec should not clean up on error #1818

Merged
merged 2 commits into from
Apr 14, 2023
Merged

youki exec should not clean up on error #1818

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58c2504
youki exec should not clean up on error
yihuaf Apr 14, 2023
a822e88
address review
yihuaf Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/libcontainer/src/container/builder_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,14 @@ impl<'a> ContainerBuilderImpl<'a> {
match self.run_container().context("failed to create container") {
Ok(pid) => Ok(pid),
Err(outer) => {
if let Err(inner) = self.cleanup_container() {
return Err(outer.context(inner));
// Only the init container should be cleaned up in the case of
// an error.
if matches!(self.container_type, ContainerType::InitContainer) {
if let Err(inner) = self.cleanup_container() {
return Err(outer.context(inner));
}
}

Err(outer)
}
}
Expand Down