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

server: *_status: do not fail on updating containers status

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2017-05-11 12:16:32 +02:00
parent ea98e2a295
commit 03da0fe03e
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/container_status.go
View file

@ -18,9 +18,8 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
return nil, err return nil, err
} }
if err = s.runtime.UpdateStatus(c); err != nil { // best effort if container is still in runc store...
return nil, err s.runtime.UpdateStatus(c)
}
containerID := c.ID() containerID := c.ID()
image := c.Image() image := c.Image()

5
server/sandbox_status.go
View file

@ -16,9 +16,8 @@ func (s *Server) PodSandboxStatus(ctx context.Context, req *pb.PodSandboxStatusR
} }
podInfraContainer := sb.infraContainer podInfraContainer := sb.infraContainer
if err = s.runtime.UpdateStatus(podInfraContainer); err != nil { // best effort if container is still in runc store...
return nil, err s.runtime.UpdateStatus(podInfraContainer)
}
cState := s.runtime.ContainerStatus(podInfraContainer) cState := s.runtime.ContainerStatus(podInfraContainer)