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

server/sandbox_list.go: No error on filtered list find by ID

Browse source 
We should not error when we try to find a pod ID in a filtered
list of sandboxes; instead we should return an empty struct
and log it.

This fixes another cri-test failure.

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude 2017-10-16 12:24:43 -05:00
parent 24f131584b
commit 179a3f9c0e
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/sandbox_list.go
View file

@ -42,7 +42,11 @@ func (s *Server) ListPodSandbox(ctx context.Context, req *pb.ListPodSandboxReque
if filter.Id != "" { if filter.Id != "" {
id, err := s.PodIDIndex().Get(filter.Id) id, err := s.PodIDIndex().Get(filter.Id)
if err != nil { if err != nil {
return nil, err // Not finding an ID in a filtered list should not be considered
// and error; it might have been deleted when stop was done.
// Log and return an empty struct.
logrus.Warn("unable to find pod %s with filter", filter.Id)
return &pb.ListPodSandboxResponse{}, nil
} }
sb := s.getSandbox(id) sb := s.getSandbox(id)
if sb == nil { if sb == nil {