sandbox: Stop and clean up containers that fail to create #434
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lifupan
approved these changes
Jul 21, 2020
|
/test |
jodh-intel
approved these changes
Jul 21, 2020
amshinde
reviewed
Jul 21, 2020
| @@ -1201,6 +1202,16 @@ func (s *Sandbox) CreateContainer(contConfig ContainerConfig) (VCContainer, erro | |||
| defer func() { | |||
| // Rollback if error happens. | |||
| if err != nil { | |||
| logger := s.Logger().WithFields(logrus.Fields{"container-id": c.id, "sandox-id": s.id, "rollback": true}) | |||
|
|
|||
There was a problem hiding this comment.
nit: I would get rid of the extra empty line here.
amshinde
reviewed
Jul 21, 2020
| } | ||
|
|
||
| logger.Debug("Removing stopped container from sandbox store") | ||
|
|
There was a problem hiding this comment.
Same here. Could get rid of this extra line.
|
@evanfoster Thanks for raising. LGTM. Few minor nits. |
evanfoster
force-pushed
the
add-container-creation-cleanup
branch
from
da588b5 to
dbfad6f
Compare
|
/test |
|
@evanfoster Could you please rebase to include the sob/wip checks? Thanks! |
A container that is created and added to a sandbox can still fail the final creation steps. In this case, the container must be stopped and have its resources cleaned up to prevent leaking sandbox mounts. Forward port of kata-containers/runtime#2826 Fixes kata-containers#2816 Signed-off-by: Evan Foster <[email protected]>
evanfoster
force-pushed
the
add-container-creation-cleanup
branch
from
dbfad6f to
e5910c9
Compare
|
/test |
bergwolf
approved these changes
Jul 27, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A container that is created and added to a sandbox can still fail
the final creation steps. In this case, the container must be stopped
and have its resources cleaned up to prevent leaking sandbox mounts.
This PR is a port of kata-containers/runtime#2826
CC @fidencio
Fixes #2816
Signed-off-by: Evan Foster [email protected]