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

Merge pull request #105 from mrunalp/ctr_create_cleanup

Browse source 
Cleanup container directory and state on creation failure
This commit is contained in:
Antonio Murdaca 2016-10-06 20:20:13 +02:00 committed by GitHub
commit 138b8cce54
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
server/container.go
View file

@ -40,7 +40,7 @@ func (s *Server) generateContainerIDandName(podName string, name string, attempt
} }
// CreateContainer creates a new container in specified PodSandbox // CreateContainer creates a new container in specified PodSandbox
func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerRequest) (*pb.CreateContainerResponse, error) { func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerRequest) (res *pb.CreateContainerResponse, err error) {
sbID := req.GetPodSandboxId() sbID := req.GetPodSandboxId()
if sbID == "" { if sbID == "" {
return nil, fmt.Errorf("PodSandboxId should not be empty") return nil, fmt.Errorf("PodSandboxId should not be empty")
@ -75,6 +75,14 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
// containerDir is the dir for the container bundle. // containerDir is the dir for the container bundle.
containerDir := filepath.Join(s.runtime.ContainerDir(), containerID) containerDir := filepath.Join(s.runtime.ContainerDir(), containerID)
defer func() {
if err != nil {
err1 := os.RemoveAll(containerDir)
if err1 != nil {
logrus.Warnf("Failed to cleanup container directory: %v")
}
}
}()
if _, err = os.Stat(containerDir); err == nil { if _, err = os.Stat(containerDir); err == nil {
return nil, fmt.Errorf("container (%s) already exists", containerDir) return nil, fmt.Errorf("container (%s) already exists", containerDir)
@ -89,17 +97,18 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
return nil, err return nil, err
} }
if err := s.runtime.CreateContainer(container); err != nil { if err = s.runtime.CreateContainer(container); err != nil {
return nil, err return nil, err
} }
if err := s.runtime.UpdateStatus(container); err != nil { if err = s.runtime.UpdateStatus(container); err != nil {
return nil, err return nil, err
} }
s.addContainer(container) s.addContainer(container)
if err := s.ctrIDIndex.Add(containerID); err != nil { if err = s.ctrIDIndex.Add(containerID); err != nil {
s.removeContainer(container)
return nil, err return nil, err
} }