From 415ac3bf8aeead4169a275a0e03e1c569b1e466d Mon Sep 17 00:00:00 2001 From: Claire Li Date: Wed, 5 Nov 2014 21:26:25 -0800 Subject: [PATCH] Refactor selectHost in generic_scheduler --- pkg/scheduler/generic_scheduler.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/scheduler/generic_scheduler.go b/pkg/scheduler/generic_scheduler.go index 5624b85094b..77c95ae9742 100644 --- a/pkg/scheduler/generic_scheduler.go +++ b/pkg/scheduler/generic_scheduler.go @@ -49,10 +49,10 @@ func (g *genericScheduler) Schedule(pod api.Pod, minionLister MinionLister) (str if len(priorityList) == 0 { return "", fmt.Errorf("failed to find a fit for pod: %v", pod) } - return g.selectHost(priorityList) + return g.selectHost(priorityList), nil } -func (g *genericScheduler) selectHost(priorityList HostPriorityList) (string, error) { +func (g *genericScheduler) selectHost(priorityList HostPriorityList) string { sort.Sort(priorityList) hosts := getMinHosts(priorityList) @@ -60,7 +60,7 @@ func (g *genericScheduler) selectHost(priorityList HostPriorityList) (string, er defer g.randomLock.Unlock() ix := g.random.Int() % len(hosts) - return hosts[ix], nil + return hosts[ix] } func findNodesThatFit(pod api.Pod, podLister PodLister, predicates []FitPredicate, nodes api.MinionList) (api.MinionList, error) {