Merge pull request #25710 from xiangpengzhao/fix_predicate

Automatic merge from submit-queue No need to log empty string in predicates.go If `pvcName` is empty, we don't need to log it.

Merge pull request #25710 from xiangpengzhao/fix_predicate
a405df43 · k8s-merge-robot · GitHub · c4aa7ee0 · 74901ae1 · a405df43
Commit a405df43 authored Jun 24, 2016 by k8s-merge-robot Committed by GitHub Jun 24, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

predicates.go plugin/pkg/scheduler/algorithm/predicates/predicates.go +2 -2

No files found.
--- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go
+++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go
@@ -156,7 +156,7 @@ func (c *MaxPDVolumeCountChecker) filterVolumes(volumes []api.Volume, namespace 
 		} else if vol.PersistentVolumeClaim != nil {
 			pvcName := vol.PersistentVolumeClaim.ClaimName
 			if pvcName == "" {
-				return fmt.Errorf("PersistentVolumeClaim had no name: %q", pvcName)
+				return fmt.Errorf("PersistentVolumeClaim had no name")
 			}
 			pvc, err := c.pvcInfo.GetPersistentVolumeClaimInfo(namespace, pvcName)
 			if err != nil {
@@ -322,7 +322,7 @@ func (c *VolumeZoneChecker) predicate(pod *api.Pod, nodeInfo *schedulercache.Nod
 		if volume.PersistentVolumeClaim != nil {
 			pvcName := volume.PersistentVolumeClaim.ClaimName
 			if pvcName == "" {
-				return false, fmt.Errorf("PersistentVolumeClaim had no name: %q", pvcName)
+				return false, fmt.Errorf("PersistentVolumeClaim had no name")
 			}
 			pvc, err := c.pvcInfo.GetPersistentVolumeClaimInfo(namespace, pvcName)
 			if err != nil {