github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-03 23:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18416 from xiang90/r_scheduler

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-23 09:06:39 -08:00
parent 3872c7e0dc f3ced64a80
commit 2c89a8d16d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugin/pkg/scheduler/generic_scheduler.go
View File

@@ -63,6 +63,9 @@ type genericScheduler struct {
randomLock sync.Mutex randomLock sync.Mutex
} }
// Schedule tries to schedule the given pod to one of node in the node list.
// If it succeeds, it will return the name of the node.
// If it fails, it will return a Fiterror error with reasons.
func (g *genericScheduler) Schedule(pod *api.Pod, nodeLister algorithm.NodeLister) (string, error) { func (g *genericScheduler) Schedule(pod *api.Pod, nodeLister algorithm.NodeLister) (string, error) {
nodes, err := nodeLister.List() nodes, err := nodeLister.List()
if err != nil { if err != nil {
@@ -84,17 +87,18 @@ func (g *genericScheduler) Schedule(pod *api.Pod, nodeLister algorithm.NodeListe
return "", err return "", err
} }
priorityList, err := PrioritizeNodes(pod, machinesToPods, g.pods, g.prioritizers, algorithm.FakeNodeLister(filteredNodes), g.extenders) if len(filteredNodes.Items) == 0 {
if err != nil {
return "", err
}
if len(priorityList) == 0 {
return "", &FitError{ return "", &FitError{
Pod: pod, Pod: pod,
FailedPredicates: failedPredicateMap, FailedPredicates: failedPredicateMap,
} }
} }
priorityList, err := PrioritizeNodes(pod, machinesToPods, g.pods, g.prioritizers, algorithm.FakeNodeLister(filteredNodes), g.extenders)
if err != nil {
return "", err
}
return g.selectHost(priorityList) return g.selectHost(priorityList)
} }