From 87d7296ea81fc266c558ad0e118d7b657bd6cbc6 Mon Sep 17 00:00:00 2001
From: Antonio Murdaca <runcom@redhat.com>
Date: Thu, 11 May 2017 11:50:19 +0200
Subject: [PATCH] server: do not guard runtime.StopContainer

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
---
 server/container_remove.go | 8 ++------
 server/container_stop.go   | 8 ++------
 server/sandbox_remove.go   | 9 ++-------
 server/sandbox_stop.go     | 8 ++------
 4 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/server/container_remove.go b/server/container_remove.go
index 028ffed8..3f36b3d6 100644
--- a/server/container_remove.go
+++ b/server/container_remove.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/kubernetes-incubator/cri-o/oci"
 	"golang.org/x/net/context"
 	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
 )
@@ -22,11 +21,8 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
 		return nil, fmt.Errorf("failed to update container state: %v", err)
 	}
 
-	cState := s.runtime.ContainerStatus(c)
-	if cState.Status == oci.ContainerStateCreated || cState.Status == oci.ContainerStateRunning {
-		if err := s.runtime.StopContainer(c); err != nil {
-			return nil, fmt.Errorf("failed to stop container %s: %v", c.ID(), err)
-		}
+	if err := s.runtime.StopContainer(c); err != nil {
+		return nil, fmt.Errorf("failed to stop container %s: %v", c.ID(), err)
 	}
 
 	if err := s.runtime.DeleteContainer(c); err != nil {
diff --git a/server/container_stop.go b/server/container_stop.go
index 58865edf..fd255cf5 100644
--- a/server/container_stop.go
+++ b/server/container_stop.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/kubernetes-incubator/cri-o/oci"
 	"golang.org/x/net/context"
 	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
 )
@@ -20,11 +19,8 @@ func (s *Server) StopContainer(ctx context.Context, req *pb.StopContainerRequest
 	if err := s.runtime.UpdateStatus(c); err != nil {
 		return nil, err
 	}
-	cStatus := s.runtime.ContainerStatus(c)
-	if cStatus.Status != oci.ContainerStateStopped {
-		if err := s.runtime.StopContainer(c); err != nil {
-			return nil, fmt.Errorf("failed to stop container %s: %v", c.ID(), err)
-		}
+	if err := s.runtime.StopContainer(c); err != nil {
+		return nil, fmt.Errorf("failed to stop container %s: %v", c.ID(), err)
 	}
 
 	resp := &pb.StopContainerResponse{}
diff --git a/server/sandbox_remove.go b/server/sandbox_remove.go
index 9628c6b5..862739eb 100644
--- a/server/sandbox_remove.go
+++ b/server/sandbox_remove.go
@@ -5,7 +5,6 @@ import (
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/kubernetes-incubator/cri-o/oci"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"golang.org/x/net/context"
 	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
@@ -36,12 +35,8 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
 			return nil, fmt.Errorf("failed to update container state: %v", err)
 		}
 
-		cState := s.runtime.ContainerStatus(c)
-		if cState.Status == oci.ContainerStateCreated || cState.Status == oci.ContainerStateRunning {
-			if err := s.runtime.StopContainer(c); err != nil {
-				// Assume container is already stopped
-				logrus.Warnf("failed to stop container %s: %v", c.Name(), err)
-			}
+		if err := s.runtime.StopContainer(c); err != nil {
+			return fmt.Errorf("failed to stop container %s: %v", c.Name(), err)
 		}
 
 		if err := s.runtime.DeleteContainer(c); err != nil {
diff --git a/server/sandbox_stop.go b/server/sandbox_stop.go
index a6f8d32b..755410da 100644
--- a/server/sandbox_stop.go
+++ b/server/sandbox_stop.go
@@ -5,7 +5,6 @@ import (
 	"os"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/kubernetes-incubator/cri-o/oci"
 	"golang.org/x/net/context"
 	pb "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
 )
@@ -46,11 +45,8 @@ func (s *Server) StopPodSandbox(ctx context.Context, req *pb.StopPodSandboxReque
 		if err := s.runtime.UpdateStatus(c); err != nil {
 			return nil, err
 		}
-		cStatus := s.runtime.ContainerStatus(c)
-		if cStatus.Status != oci.ContainerStateStopped {
-			if err := s.runtime.StopContainer(c); err != nil {
-				return nil, fmt.Errorf("failed to stop container %s in pod sandbox %s: %v", c.Name(), sb.id, err)
-			}
+		if err := s.runtime.StopContainer(c); err != nil {
+			return nil, fmt.Errorf("failed to stop container %s in pod sandbox %s: %v", c.Name(), sb.id, err)
 		}
 	}