github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-12 20:39:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1217 from snir911/fix_hanging_pods

Browse Source 
shimv2: Avoid double removing of container from sandbox
This commit is contained in:
Fabiano Fidêncio
2021-01-08 15:00:54 +01:00
committed by GitHub
parent 31519333a0 5c464018ed
commit ce27c00ee2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime/containerd-shim-v2/delete.go
View File

@@ -17,13 +17,12 @@ import (
func deleteContainer(ctx context.Context, s *service, c *container) error {
if !c.cType.IsSandbox() {
if c.status != task.StatusStopped {
_, err := s.sandbox.StopContainer(c.id, false)
if err != nil {
if _, err := s.sandbox.StopContainer(c.id, false); err != nil && !isNotFound(err) {
return err
}
}
if _, err := s.sandbox.DeleteContainer(c.id); err != nil {
if _, err := s.sandbox.DeleteContainer(c.id); err != nil && !isNotFound(err) {
return err
}
}