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

Be more diligent about cleaning up failed-to-create containers

Browse source 
If server/Server.createSandboxContainer() fails after calling
server/Server.StorageRuntimeServer().CreateContainer(), cleanup logic in
server/Server.CreateContainer() won't try to clean it up, but we still
need to clean up the on-disk container and its layer.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2017-12-01 11:04:51 -05:00
parent 6a456d1502
commit 893aa4e8c7
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/container_create.go
View file

@ -1065,6 +1065,14 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer func() {
if err != nil {
err2 := s.StorageRuntimeServer().DeleteContainer(containerInfo.ID)
if err2 != nil {
logrus.Warnf("Failed to cleanup container directory: %v", err2)
}
}
}()
mountPoint, err := s.StorageRuntimeServer().StartContainer(containerID) mountPoint, err := s.StorageRuntimeServer().StartContainer(containerID)
if err != nil { if err != nil {
@ -1074,7 +1082,8 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
containerImageConfig := containerInfo.Config containerImageConfig := containerInfo.Config
if containerImageConfig == nil { if containerImageConfig == nil {
return nil, fmt.Errorf("empty image config for %s", image) err = fmt.Errorf("empty image config for %s", image)
return nil, err
} }
if containerImageConfig.Config.StopSignal != "" { if containerImageConfig.Config.StopSignal != "" {