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

Merge pull request #37 from mrunalp/pod_stop_check

Browse source 
Check if container in a pod is already stopped before stopping it
This commit is contained in:
Antonio Murdaca 2016-09-19 23:08:06 +02:00 committed by GitHub
commit 3f77076fc2
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/sandbox.go
View file

@ -226,10 +226,13 @@ func (s *Server) StopPodSandbox(ctx context.Context, req *pb.StopPodSandboxReque
return nil, fmt.Errorf("failed to destroy network for container %s in sandbox %s: %v", c.Name(), *sbName, err) return nil, fmt.Errorf("failed to destroy network for container %s in sandbox %s: %v", c.Name(), *sbName, err)
} }
} }
cStatus := s.runtime.ContainerStatus(c)
if cStatus.Status != "stopped" {
if err := s.runtime.StopContainer(c); err != nil { if err := s.runtime.StopContainer(c); err != nil {
return nil, fmt.Errorf("failed to stop container %s in sandbox %s: %v", c.Name(), *sbName, err) return nil, fmt.Errorf("failed to stop container %s in sandbox %s: %v", c.Name(), *sbName, err)
} }
} }
}
return &pb.StopPodSandboxResponse{}, nil return &pb.StopPodSandboxResponse{}, nil
} }