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

Container state fixes

Browse source 
Move Container State constants to oci package
and fixup where strings were used instead of
the status constants

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-10-06 15:16:21 -07:00
parent 9b42de99d1
commit 77afd34a27
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/sandbox.go
View file

@ -286,7 +286,7 @@ func (s *Server) StopPodSandbox(ctx context.Context, req *pb.StopPodSandboxReque
}
}
cStatus := s.runtime.ContainerStatus(c)
if cStatus.Status != "stopped" {
if cStatus.Status != oci.ContainerStateStopped {
if err := s.runtime.StopContainer(c); err != nil {
return nil, fmt.Errorf("failed to stop container %s in sandbox %s: %v", c.Name(), sandboxID, err)
}
@ -324,7 +324,7 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
}
cState := s.runtime.ContainerStatus(c)
if cState.Status == ContainerStateCreated || cState.Status == ContainerStateRunning {
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.Name(), err)
}
@ -400,7 +400,7 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
}
rStatus := pb.PodSandBoxState_NOTREADY
if cState.Status == ContainerStateRunning {
if cState.Status == oci.ContainerStateRunning {
rStatus = pb.PodSandBoxState_READY
}
@ -436,7 +436,7 @@ func (s *Server) ListPodSandbox(context.Context, *pb.ListPodSandboxRequest) (*pb
cState := s.runtime.ContainerStatus(podInfraContainer)
created := cState.Created.Unix()
rStatus := pb.PodSandBoxState_NOTREADY
if cState.Status == ContainerStateRunning {
if cState.Status == oci.ContainerStateRunning {
rStatus = pb.PodSandBoxState_READY
}