Merge pull request #241 from sameo/topic/sandbox_remove

Make RemovePodSandbox idempotent

server/sandbox.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/docker/docker/pkg/stringid"
@@ -26,6 +27,10 @@ const (
 	podDefaultNamespace = "default"
 )
 
+var (
+	errSandboxIDEmpty = errors.New("PodSandboxId should not be empty")
+)
+
 func (s *sandbox) addContainer(c *oci.Container) {
 	s.containers.Add(c.Name(), c)
 }
@@ -60,7 +65,7 @@ type podSandboxRequest interface {
 func (s *Server) getPodSandboxFromRequest(req podSandboxRequest) (*sandbox, error) {
 	sbID := req.GetPodSandboxId()
 	if sbID == "" {
-		return nil, fmt.Errorf("PodSandboxId should not be empty")
+		return nil, errSandboxIDEmpty
 	}
 
 	sandboxID, err := s.podIDIndex.Get(sbID)

server/sandbox_remove.go

@@ -18,9 +18,15 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
 	logrus.Debugf("RemovePodSandboxRequest %+v", req)
 	sb, err := s.getPodSandboxFromRequest(req)
 	if err != nil {
+		if err == errSandboxIDEmpty {
 			return nil, err
 		}
 
+		resp := &pb.RemovePodSandboxResponse{}
+		logrus.Warnf("could not get sandbox %s, it's probably been removed already: %v", req.GetPodSandboxId(), err)
+		return resp, nil
+	}
+
 	podInfraContainer := sb.infraContainer
 	containers := sb.containers.List()
 	containers = append(containers, podInfraContainer)