github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #71504 from ping035627/k8s-181128 

Perfect some logs description
pull/564/head
Kubernetes Prow Robot 2019-01-09 19:28:10 -08:00 committed by GitHub
parent c9e1ffb0e7 a9154b1a91
commit 97d7795070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/scheduler/factory/factory.go
View File

@ -297,10 +297,10 @@ func NewConfigFactory(args *ConfigFactoryArgs) Configurator {
if pod, ok := t.Obj.(*v1.Pod); ok { if pod, ok := t.Obj.(*v1.Pod); ok {
return assignedPod(pod) return assignedPod(pod)
} }
runtime.HandleError(fmt.Errorf("unable to convert object %T to *v1.Pod in %T", obj, c)) runtime.HandleError(fmt.Errorf("unable to convert object %T to *v1.Pod for filtering scheduledPod in %T", obj, c))
return false return false
default: default:
runtime.HandleError(fmt.Errorf("unable to handle object in %T: %T", c, obj)) runtime.HandleError(fmt.Errorf("unable to handle object for filtering scheduledPod in %T: %T", c, obj))
return false return false
} }
}, },
@ -322,10 +322,10 @@ func NewConfigFactory(args *ConfigFactoryArgs) Configurator {
if pod, ok := t.Obj.(*v1.Pod); ok { if pod, ok := t.Obj.(*v1.Pod); ok {
return !assignedPod(pod) && responsibleForPod(pod, args.SchedulerName) return !assignedPod(pod) && responsibleForPod(pod, args.SchedulerName)
} }
runtime.HandleError(fmt.Errorf("unable to convert object %T to *v1.Pod in %T", obj, c)) runtime.HandleError(fmt.Errorf("unable to convert object %T to *v1.Pod for filtering unscheduledPod in %T", obj, c))
return false return false
default: default:
runtime.HandleError(fmt.Errorf("unable to handle object in %T: %T", c, obj)) runtime.HandleError(fmt.Errorf("unable to handle object for filtering unscheduledPod in %T: %T", c, obj))
return false return false
} }
}, },
@ -450,7 +450,7 @@ func (c *configFactory) onPvAdd(obj interface{}) {
// Pods created when there are no PVs available will be stuck in // Pods created when there are no PVs available will be stuck in
// unschedulable queue. But unbound PVs created for static provisioning and // unschedulable queue. But unbound PVs created for static provisioning and
// delay binding storage class are skipped in PV controller dynamic // delay binding storage class are skipped in PV controller dynamic
// provisiong and binding process, will not trigger events to schedule pod // provisioning and binding process, will not trigger events to schedule pod
// again. So we need to move pods to active queue on PV add for this // again. So we need to move pods to active queue on PV add for this
// scenario. // scenario.
c.podQueue.MoveAllToActiveQueue() c.podQueue.MoveAllToActiveQueue()
@ -480,7 +480,7 @@ func (c *configFactory) onPvcUpdate(old, new interface{}) {
func (c *configFactory) onStorageClassAdd(obj interface{}) { func (c *configFactory) onStorageClassAdd(obj interface{}) {
sc, ok := obj.(*storagev1.StorageClass) sc, ok := obj.(*storagev1.StorageClass)
if !ok { if !ok {
klog.Errorf("cannot convert to *storagev1.StorageClass: %v", obj) klog.Errorf("cannot convert to *storagev1.StorageClass for storageClassAdd: %v", obj)
return return
} }
@ -523,7 +523,7 @@ func (c *configFactory) GetClient() clientset.Interface {
return c.client return c.client
} }
// GetScheduledPodListerIndexer provides a pod lister, mostly internal use, but may also be called by mock-tests. // GetScheduledPodLister provides a pod lister, mostly internal use, but may also be called by mock-tests.
func (c *configFactory) GetScheduledPodLister() corelisters.PodLister { func (c *configFactory) GetScheduledPodLister() corelisters.PodLister {
return c.scheduledPodLister return c.scheduledPodLister
} }
@ -611,7 +611,7 @@ func (c *configFactory) deletePodFromCache(obj interface{}) {
var ok bool var ok bool
pod, ok = t.Obj.(*v1.Pod) pod, ok = t.Obj.(*v1.Pod)
if !ok { if !ok {
klog.Errorf("cannot convert to *v1.Pod: %v", t.Obj) klog.Errorf("cannot convert DeletedFinalStateUnknown obj to *v1.Pod: %v", t.Obj)
return return
} }
default: default:
@ -722,7 +722,7 @@ func (c *configFactory) deleteNodeFromCache(obj interface{}) {
var ok bool var ok bool
node, ok = t.Obj.(*v1.Node) node, ok = t.Obj.(*v1.Node)
if !ok { if !ok {
klog.Errorf("cannot convert to *v1.Node: %v", t.Obj) klog.Errorf("cannot convert DeletedFinalStateUnknown obj to *v1.Node: %v", t.Obj)
return return
} }
default: default: