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

runtime: sandbox delete should succeed after verifying sandbox state

Browse Source 
Otherwise we might block delete and create orphan containers.

Fixes: #1039

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
Signed-off-by: Eric Ernst <eric_ernst@apple.com>
This commit is contained in:
Peng Tao 2020-10-18 11:58:55 +08:00 committed by Eric Ernst
parent c995a982bc
commit 35151f1786
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/virtcontainers/sandbox.go
View File

@ -686,13 +686,13 @@ func (s *Sandbox) Delete(ctx context.Context) error {
for _, c := range s.containers { for _, c := range s.containers {
if err := c.delete(ctx); err != nil { if err := c.delete(ctx); err != nil {
return err s.Logger().WithError(err).WithField("cid", c.id).Debug("failed to delete container")
} }
} }
if !rootless.IsRootless() { if !rootless.IsRootless() {
if err := s.cgroupsDelete(); err != nil { if err := s.cgroupsDelete(); err != nil {
return err s.Logger().WithError(err).Error("failed to cleanup cgroups")
} }
} }