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

Merge pull request #383 from sameo/topic/storage

Browse source 
server: Remove the mount points after stopping the containers
This commit is contained in:
Mrunal Patel 2017-03-21 07:46:08 -07:00 committed by GitHub
commit b487a9b7dd
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/container_remove.go
View file

@ -34,6 +34,8 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
return nil, fmt.Errorf("failed to delete container %s: %v", c.ID(), err) return nil, fmt.Errorf("failed to delete container %s: %v", c.ID(), err)
} }
s.removeContainer(c)
if err := s.storage.StopContainer(c.ID()); err != nil { if err := s.storage.StopContainer(c.ID()); err != nil {
return nil, fmt.Errorf("failed to unmount container %s: %v", c.ID(), err) return nil, fmt.Errorf("failed to unmount container %s: %v", c.ID(), err)
} }
@ -43,7 +45,6 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
} }
s.releaseContainerName(c.Name()) s.releaseContainerName(c.Name())
s.removeContainer(c)
if err := s.ctrIDIndex.Delete(c.ID()); err != nil { if err := s.ctrIDIndex.Delete(c.ID()); err != nil {
return nil, err return nil, err

7
server/sandbox_remove.go
View file

@ -81,6 +81,9 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
return nil, fmt.Errorf("failed to remove networking namespace for sandbox %s: %v", sb.id, err) return nil, fmt.Errorf("failed to remove networking namespace for sandbox %s: %v", sb.id, err)
} }
s.removeContainer(podInfraContainer)
sb.infraContainer = nil
// Remove the files related to the sandbox // Remove the files related to the sandbox
if err := s.storage.StopContainer(sb.id); err != nil { if err := s.storage.StopContainer(sb.id); err != nil {
return nil, fmt.Errorf("failed to delete sandbox container in pod sandbox %s: %v", sb.id, err) return nil, fmt.Errorf("failed to delete sandbox container in pod sandbox %s: %v", sb.id, err)
@ -90,8 +93,6 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
} }
s.releaseContainerName(podInfraContainer.Name()) s.releaseContainerName(podInfraContainer.Name())
s.removeContainer(podInfraContainer)
sb.infraContainer = nil
if err := s.ctrIDIndex.Delete(podInfraContainer.ID()); err != nil { if err := s.ctrIDIndex.Delete(podInfraContainer.ID()); err != nil {
return nil, fmt.Errorf("failed to delete infra container %s in pod sandbox %s from index: %v", podInfraContainer.ID(), sb.id, err) return nil, fmt.Errorf("failed to delete infra container %s in pod sandbox %s from index: %v", podInfraContainer.ID(), sb.id, err)
} }
@ -99,7 +100,7 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
s.releasePodName(sb.name) s.releasePodName(sb.name)
s.removeSandbox(sb.id) s.removeSandbox(sb.id)
if err := s.podIDIndex.Delete(sb.id); err != nil { if err := s.podIDIndex.Delete(sb.id); err != nil {
return nil, fmt.Errorf("failed to pod sandbox %s from index: %v", sb.id, err) return nil, fmt.Errorf("failed to delete pod sandbox %s from index: %v", sb.id, err)
} }
resp := &pb.RemovePodSandboxResponse{} resp := &pb.RemovePodSandboxResponse{}