From 53945dea0871454ff2cb01c0edfd0d9e9026a115 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 1 Jun 2017 12:07:03 +0200 Subject: [PATCH] RemovePodSandbox must be idempotent Signed-off-by: Antonio Murdaca --- server/sandbox_remove.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sandbox_remove.go b/server/sandbox_remove.go index 09f2d054..1994ebcc 100644 --- a/server/sandbox_remove.go +++ b/server/sandbox_remove.go @@ -96,7 +96,7 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR if err := s.storageRuntimeServer.StopContainer(sb.id); err != nil { logrus.Warnf("failed to stop sandbox container in pod sandbox %s: %v", sb.id, err) } - if err := s.storageRuntimeServer.RemovePodSandbox(sb.id); err != nil { + if err := s.storageRuntimeServer.RemovePodSandbox(sb.id); err != nil && err != storage.ErrInvalidSandboxID { return nil, fmt.Errorf("failed to remove pod sandbox %s: %v", sb.id, err) }