From c9a60e2d2c3f39aff5cbd136b3243187091aa40a Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 21 Jun 2016 14:56:11 +0200 Subject: [PATCH] Rephrase 'pv not found in cache' warnings. When kubelet starts a pod that refers to non-existing PV, PVC or Node, it should clearly show that the requested element does not exist. Previous "PersistentVolumeClaim 'default/ceph-claim-wm' is not in cache" looks like random kubelet hiccup, while "PersistentVolumeClaim 'default/ceph-claim-wm' not found" suggests that the object may not exist at all and it might be an user error. Fixes #27523 --- pkg/client/cache/listers.go | 4 ++-- plugin/pkg/scheduler/algorithm/predicates/predicates.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/client/cache/listers.go b/pkg/client/cache/listers.go index 1ba0be3a6be..90c9c62f9b7 100644 --- a/pkg/client/cache/listers.go +++ b/pkg/client/cache/listers.go @@ -582,7 +582,7 @@ func (s *StoreToPVFetcher) GetPersistentVolumeInfo(id string) (*api.PersistentVo } if !exists { - return nil, fmt.Errorf("PersistentVolume '%v' is not in cache", id) + return nil, fmt.Errorf("PersistentVolume '%v' not found", id) } return o.(*api.PersistentVolume), nil @@ -601,7 +601,7 @@ func (s *StoreToPVCFetcher) GetPersistentVolumeClaimInfo(namespace string, id st } if !exists { - return nil, fmt.Errorf("PersistentVolumeClaim '%s/%s' is not in cache", namespace, id) + return nil, fmt.Errorf("PersistentVolumeClaim '%s/%s' not found", namespace, id) } return o.(*api.PersistentVolumeClaim), nil diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index e91b1ecef79..ecc0caee901 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -59,7 +59,7 @@ func (c *CachedNodeInfo) GetNodeInfo(id string) (*api.Node, error) { } if !exists { - return nil, fmt.Errorf("node '%v' is not in cache", id) + return nil, fmt.Errorf("node '%v' not found", id) } return node.(*api.Node), nil