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

server: readable fields

Browse source 
`git grep -w images` or `git grep -w storage` needs to be more useful.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
This commit is contained in:
Vincent Batts 2017-04-19 15:17:10 -04:00
parent 0b48dd5d7f
commit f401adffa9
Signed by: vbatts
GPG key ID: 10937E57733F1362
11 changed files with 72 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/container_create.go
View file

@ -250,7 +250,7 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
}
defer func() {
if err != nil {
err2 := s.storage.DeleteContainer(containerID)
err2 := s.storageRuntimeServer.DeleteContainer(containerID)
if err2 != nil {
logrus.Warnf("Failed to cleanup container directory: %v", err2)
}
@ -491,7 +491,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
metaname := metadata.Name
attempt := metadata.Attempt
containerInfo, err := s.storage.CreateContainer(s.imageContext,
containerInfo, err := s.storageRuntimeServer.CreateContainer(s.imageContext,
sb.name, sb.id,
image, image,
containerName, containerID,
@ -503,7 +503,7 @@ func (s *Server) createSandboxContainer(ctx context.Context, containerID string,
return nil, err
}
mountPoint, err := s.storage.StartContainer(containerID)
mountPoint, err := s.storageRuntimeServer.StartContainer(containerID)
if err != nil {
return nil, fmt.Errorf("failed to mount container %s(%s): %v", containerName, containerID, err)
}