Merge pull request #47225 from NickrenREN/fix-operation

Automatic merge from submit-queue Fix mismatched types Verbose and bool Fix invalid operation: mismatched types Verbose and bool **Release note**: ```release-note NONE ```

Merge pull request #47225 from NickrenREN/fix-operation
53a66020 · Kubernetes Submit Queue · GitHub · c885c70c · 1766af60 · 53a66020
Commit 53a66020 authored Jun 25, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

predicates.go plugin/pkg/scheduler/algorithm/predicates/predicates.go +7 -5

No files found.
--- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go
+++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go
@@ -620,11 +620,13 @@ func PodFitsResources(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.No
 		}
 	}
-	if glog.V(10) && len(predicateFails) == 0 {
+	if glog.V(10) {
-		// We explicitly don't do glog.V(10).Infof() to avoid computing all the parameters if this is
+		if len(predicateFails) == 0 {
-		// not logged. There is visible performance gain from it.
+			// We explicitly don't do glog.V(10).Infof() to avoid computing all the parameters if this is
-		glog.Infof("Schedule Pod %+v on Node %+v is allowed, Node is running only %v out of %v Pods.",
+			// not logged. There is visible performance gain from it.
-			podName(pod), node.Name, len(nodeInfo.Pods()), allowedPodNumber)
+			glog.Infof("Schedule Pod %+v on Node %+v is allowed, Node is running only %v out of %v Pods.",
+				podName(pod), node.Name, len(nodeInfo.Pods()), allowedPodNumber)
+		}
 	}
 	return len(predicateFails) == 0, predicateFails, nil
 }