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

Merge a8e7e22a79 into cb7239caa6

Browse source
This commit is contained in:
Gao feng 2016-10-27 10:44:23 +00:00 • committed by GitHub
commit 3917598a4c
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/container.go
View file

@ -383,6 +383,16 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
return nil, err return nil, err
} }
sb := s.getSandbox(c.Sandbox())
if sb == nil {
return nil, fmt.Errorf("failed to find sandbox for container %s", c.ID())
}
podInfraContainerName := sb.name + "-infra"
if podInfraContainerName == c.Name() {
return nil, fmt.Errorf("can not delete Infra container %s\n", c.ID())
}
if err := s.runtime.UpdateStatus(c); err != nil { if err := s.runtime.UpdateStatus(c); err != nil {
return nil, fmt.Errorf("failed to update container state: %v", err) return nil, fmt.Errorf("failed to update container state: %v", err)
} }