Merge pull request #25934 from ping035627/ping035627-patch-3

Automatic merge from submit-queue Fix #25606: Add the length detection of the "predicateFuncs" in generic_scheduler.go Fix #25606 The PR add the length detection of the "predicateFuncs" for "findNodesThatFit" function of generic_scheduler.go. In “findNodesThatFit” function, if the length of the "predicateFuncs" parameter is 0, it can set filtered equals nodes.Items, and needn't to traverse the nodes.Items.

Merge pull request #25934 from ping035627/ping035627-patch-3
4e6e4ee1 · k8s-merge-robot · GitHub · b4c81a07 · e2af16b1 · 4e6e4ee1
Commit 4e6e4ee1 authored Jun 25, 2016 by k8s-merge-robot Committed by GitHub Jun 25, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 19 deletions

generic_scheduler.go plugin/pkg/scheduler/generic_scheduler.go +23 -19

No files found.
--- a/plugin/pkg/scheduler/generic_scheduler.go
+++ b/plugin/pkg/scheduler/generic_scheduler.go
@@ -135,31 +135,35 @@ func (g *genericScheduler) selectHost(priorityList schedulerapi.HostPriorityList
 // Filters the nodes to find the ones that fit based on the given predicate functions
 // Each node is passed through the predicate functions to determine if it is a fit
 func findNodesThatFit(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, predicateFuncs map[string]algorithm.FitPredicate, nodes api.NodeList, extenders []algorithm.SchedulerExtender) (api.NodeList, FailedPredicateMap, error) {
-	predicateResultLock := sync.Mutex{}
 	filtered := []api.Node{}
 	failedPredicateMap := FailedPredicateMap{}
-	errs := []error{}
-	checkNode := func(i int) {
+	if len(predicateFuncs) == 0 {
-		nodeName := nodes.Items[i].Name
+		filtered = nodes.Items
-		fits, failedPredicate, err := podFitsOnNode(pod, nodeNameToInfo[nodeName], predicateFuncs)
+	} else {
+		predicateResultLock := sync.Mutex{}
-		predicateResultLock.Lock()
+		errs := []error{}
-		defer predicateResultLock.Unlock()
+		checkNode := func(i int) {
-		if err != nil {
+			nodeName := nodes.Items[i].Name
-			errs = append(errs, err)
+			fits, failedPredicate, err := podFitsOnNode(pod, nodeNameToInfo[nodeName], predicateFuncs)
-			return
+			predicateResultLock.Lock()
+			defer predicateResultLock.Unlock()
+			if err != nil {
+				errs = append(errs, err)
+				return
+			}
+			if fits {
+				filtered = append(filtered, nodes.Items[i])
+			} else {
+				failedPredicateMap[nodeName] = failedPredicate
+			}
 		}
-		if fits {
+		workqueue.Parallelize(16, len(nodes.Items), checkNode)
-			filtered = append(filtered, nodes.Items[i])
+		if len(errs) > 0 {
-		} else {
+			return api.NodeList{}, FailedPredicateMap{}, errors.NewAggregate(errs)
-			failedPredicateMap[nodeName] = failedPredicate
 		}
 	}
-	workqueue.Parallelize(16, len(nodes.Items), checkNode)
-	if len(errs) > 0 {
-		return api.NodeList{}, FailedPredicateMap{}, errors.NewAggregate(errs)
-	}
 	if len(filtered) > 0 && len(extenders) != 0 {
 		for _, extender := range extenders {