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

Stop container first if it is running on RemoveContainer

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-09-28 12:24:12 -07:00
parent 7e2460ad73
commit 72ac4fe33e
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/container.go
View file

@ -352,6 +352,17 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
return nil, fmt.Errorf("specified container not found: %s", *containerName) return nil, fmt.Errorf("specified container not found: %s", *containerName)
} }
if err := s.runtime.UpdateStatus(c); err != nil {
return nil, fmt.Errorf("failed to update container state: %v", err)
}
cState := s.runtime.ContainerStatus(c)
if cState.Status == ContainerStateCreated || cState.Status == ContainerStateRunning {
if err := s.runtime.StopContainer(c); err != nil {
return nil, fmt.Errorf("failed to stop container %s: %v", *containerName, err)
}
}
if err := s.runtime.DeleteContainer(c); err != nil { if err := s.runtime.DeleteContainer(c); err != nil {
return nil, fmt.Errorf("failed to delete container %s: %v", *containerName, err) return nil, fmt.Errorf("failed to delete container %s: %v", *containerName, err)
} }