shim-v2: fix shim leak when hypervisor exit unexpectly

Fixes: #1929 in containerd-kata-v2, container can only be deleted in Delete interface, or other shim operates(like kill/delete) all fails since can not get container info. Signed-off-by: Ace-Tang <[email protected]>
kata-containers · Aug 5, 2019 · 8ad6b0e · 8ad6b0e
1 parent 00e0aaa
commit 8ad6b0e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/containerd-shim-v2/service.go b/containerd-shim-v2/service.go
@@ -654,6 +654,10 @@ func (s *service) Kill(ctx context.Context, r *taskAPI.KillRequest) (_ *ptypes.E
 		return nil, err
 	}
 
+	if status, _ := s.sandbox.StatusContainer(c.id); status.State.State == types.StateStopped {
+		return empty, nil
+	}
+
 	// According to CRI specs, kubelet will call StopPodSandbox()
 	// at least once before calling RemovePodSandbox, and this call
 	// is idempotent, and must not return an error if all relevant

diff --git a/containerd-shim-v2/wait.go b/containerd-shim-v2/wait.go
@@ -117,7 +117,6 @@ func watchSandbox(s *service) {
 			}
 		}
 	}
-	s.containers = make(map[string]*container)
 
 	// Existing container/exec will be cleaned up by its waiters.
 	// No need to send async events here.