vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

server: Don't stop a sandbox or a container in "created" state

Browse source 
There is no point in trying to stop a container that is not currently
running. More than that, the OCI specification is very clear that
trying to issue a "kill" command on a container which is not running
must be considered as an error.

Refer to OCI specification here:
https://github.com/opencontainers/runtime-spec/blob/master/runtime.md#kill

In case of a pod sandbox, OCI is not forcing anything, but I think it
does make sense not to try to stop a pod which is not running. It could
lead to unexpected behaviors, and thinking about semantics, we should
not be able to stop something which has not been started first.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2017-06-06 07:45:56 -07:00
parent fee5291495
commit f6637a326e
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/container_remove.go
View file

@ -23,7 +23,7 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
}
cState := s.runtime.ContainerStatus(c)
if cState.Status == oci.ContainerStateCreated || cState.Status == oci.ContainerStateRunning {
if cState.Status == oci.ContainerStateRunning {
if err := s.runtime.StopContainer(c, -1); err != nil {
return nil, fmt.Errorf("failed to stop container %s: %v", c.ID(), err)
}

2
server/container_stop.go
View file

@ -21,7 +21,7 @@ func (s *Server) StopContainer(ctx context.Context, req *pb.StopContainerRequest
return nil, err
}
cStatus := s.runtime.ContainerStatus(c)
if cStatus.Status != oci.ContainerStateStopped {
if cStatus.Status == oci.ContainerStateRunning {
if err := s.runtime.StopContainer(c, req.Timeout); err != nil {
return nil, fmt.Errorf("failed to stop container %s: %v", c.ID(), err)
}

2
server/sandbox_remove.go
View file

@ -44,7 +44,7 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
}
cState := s.runtime.ContainerStatus(c)
if cState.Status == oci.ContainerStateCreated || cState.Status == oci.ContainerStateRunning {
if cState.Status == oci.ContainerStateRunning {
if err := s.runtime.StopContainer(c, -1); err != nil {
// Assume container is already stopped
logrus.Warnf("failed to stop container %s: %v", c.Name(), err)

2
server/sandbox_stop.go
View file

@ -57,7 +57,7 @@ func (s *Server) StopPodSandbox(ctx context.Context, req *pb.StopPodSandboxReque
return nil, err
}
cStatus := s.runtime.ContainerStatus(c)
if cStatus.Status != oci.ContainerStateStopped {
if cStatus.Status == oci.ContainerStateRunning {
if err := s.runtime.StopContainer(c, -1); err != nil {
return nil, fmt.Errorf("failed to stop container %s in pod sandbox %s: %v", c.Name(), sb.id, err)
}