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

Add server impl for RemoveContainer

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-08-22 16:47:11 -07:00
parent f1e4ee3c95
commit 25a73811ee
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
server/runtime.go
View file

@ -488,17 +488,30 @@ func (s *Server) StopContainer(ctx context.Context, req *pb.StopContainerRequest
} }
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(), *containerName, err) return nil, fmt.Errorf("failed to stop container %s: %v", *containerName, err)
} }
return &pb.StopContainerResponse{}, nil return &pb.StopContainerResponse{}, nil
return nil, nil
} }
// RemoveContainer removes the container. If the container is running, the container // RemoveContainer removes the container. If the container is running, the container
// should be force removed. // should be force removed.
func (s *Server) RemoveContainer(context.Context, *pb.RemoveContainerRequest) (*pb.RemoveContainerResponse, error) { func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerRequest) (*pb.RemoveContainerResponse, error) {
return nil, nil containerName := req.ContainerId
if *containerName == "" {
return nil, fmt.Errorf("PodSandboxId should not be empty")
}
c := s.state.containers[*containerName]
if c == nil {
return nil, fmt.Errorf("specified container not found: %s", *containerName)
}
if err := s.runtime.DeleteContainer(c); err != nil {
return nil, fmt.Errorf("failed to delete container %s: %v", *containerName, err)
}
return &pb.RemoveContainerResponse{}, nil
} }
// ListContainers lists all containers by filters. // ListContainers lists all containers by filters.