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

Fix container removal state tracking

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-08-25 12:15:20 -07:00
parent 0c386f74f9
commit 4ee041a1c1
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/runtime.go
View file

@ -97,7 +97,7 @@ func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxR
name: name, name: name,
logDir: logDir, logDir: logDir,
labels: labels, labels: labels,
containers: []*oci.Container{}, containers: make(map[string]*oci.Container),
}) })
annotations := req.GetConfig().GetAnnotations() annotations := req.GetConfig().GetAnnotations()
@ -516,6 +516,8 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
return nil, fmt.Errorf("failed to remove container %s directory: %v", *containerName, err) return nil, fmt.Errorf("failed to remove container %s directory: %v", *containerName, err)
} }
s.removeContainer(c)
return &pb.RemoveContainerResponse{}, nil return &pb.RemoveContainerResponse{}, nil
} }