Merge pull request kubernetes#16647 from abursavich/tophost

Auto commit by PR queue bot
nikhiljindal · Nov 16, 2015 · f8db8f1 · f8db8f1
2 parents 89d7309 + c64048d
commit f8db8f1
Showing 1 changed file with 19 additions and 20 deletions.
diff --git a/plugin/pkg/scheduler/generic_scheduler.go b/plugin/pkg/scheduler/generic_scheduler.go
@@ -19,7 +19,6 @@ package scheduler
 import (
 	"fmt"
 	"math/rand"
-	"sort"
 	"strings"
 	"sync"
 
@@ -88,20 +87,32 @@ func (g *genericScheduler) Schedule(pod *api.Pod, nodeLister algorithm.NodeListe
 	return g.selectHost(priorityList)
 }
 
-// This method takes a prioritized list of nodes and sorts them in reverse order based on scores
-// and then picks one randomly from the nodes that had the highest score
+// This method takes a prioritized list of nodes, shuffles those with the highest scores to the
+// front of the list, and then picks one randomly from the nodes that had the highest score.
 func (g *genericScheduler) selectHost(priorityList algorithm.HostPriorityList) (string, error) {
 	if len(priorityList) == 0 {
 		return "", fmt.Errorf("empty priorityList")
 	}
-	sort.Sort(sort.Reverse(priorityList))
+	max := priorityList[0].Score
+	n := 0
+	for i, hostEntry := range priorityList {
+		if hostEntry.Score < max {
+			continue
+		}
+		if hostEntry.Score > max {
+			max = hostEntry.Score
+			n = 0
+		}
+		priorityList[i], priorityList[n] = priorityList[n], priorityList[i]
+		n++
+	}
+	if n == 1 {
+		return priorityList[0].Host, nil
+	}
 
-	hosts := getBestHosts(priorityList)
 	g.randomLock.Lock()
 	defer g.randomLock.Unlock()
-
-	ix := g.random.Int() % len(hosts)
-	return hosts[ix], nil
+	return priorityList[g.random.Intn(n)].Host, nil
 }
 
 // Filters the nodes to find the ones that fit based on the given predicate functions
@@ -179,18 +190,6 @@ func PrioritizeNodes(pod *api.Pod, podLister algorithm.PodLister, priorityConfig
 	return result, nil
 }
 
-func getBestHosts(list algorithm.HostPriorityList) []string {
-	result := []string{}
-	for _, hostEntry := range list {
-		if hostEntry.Score == list[0].Score {
-			result = append(result, hostEntry.Host)
-		} else {
-			break
-		}
-	}
-	return result
-}
-
 // EqualPriority is a prioritizer function that gives an equal weight of one to all nodes
 func EqualPriority(_ *api.Pod, podLister algorithm.PodLister, nodeLister algorithm.NodeLister) (algorithm.HostPriorityList, error) {
 	nodes, err := nodeLister.List()