github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18817 from mqliang/schedulerSelector

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-23 12:09:19 -08:00
commit f4f4e5cb9f
3 changed files with 8 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugin/pkg/scheduler/algorithm/predicates/predicates.go
View File

@ -427,20 +427,6 @@ func getUsedPorts(pods ...*api.Pod) map[int]bool {
return ports return ports
} }
func filterNonRunningPods(pods []*api.Pod) []*api.Pod {
if len(pods) == 0 {
return pods
}
result := []*api.Pod{}
for _, pod := range pods {
if pod.Status.Phase == api.PodSucceeded || pod.Status.Phase == api.PodFailed {
continue
}
result = append(result, pod)
}
return result
}
// MapPodsToMachines obtains a list of pods and pivots that list into a map where the keys are host names // MapPodsToMachines obtains a list of pods and pivots that list into a map where the keys are host names
// and the values are the list of pods running on that host. // and the values are the list of pods running on that host.
func MapPodsToMachines(lister algorithm.PodLister) (map[string][]*api.Pod, error) { func MapPodsToMachines(lister algorithm.PodLister) (map[string][]*api.Pod, error) {
@ -450,7 +436,6 @@ func MapPodsToMachines(lister algorithm.PodLister) (map[string][]*api.Pod, error
if err != nil { if err != nil {
return map[string][]*api.Pod{}, err return map[string][]*api.Pod{}, err
} }
pods = filterNonRunningPods(pods)
for _, scheduledPod := range pods { for _, scheduledPod := range pods {
host := scheduledPod.Spec.NodeName host := scheduledPod.Spec.NodeName
machineToPods[host] = append(machineToPods[host], scheduledPod) machineToPods[host] = append(machineToPods[host], scheduledPod)

15
plugin/pkg/scheduler/factory/factory.go
View File

@ -100,7 +100,7 @@ func NewConfigFactory(client *client.Client, rateLimiter util.RateLimiter, sched
// ScheduledPodLister is something we provide to plug in functions that // ScheduledPodLister is something we provide to plug in functions that
// they may need to call. // they may need to call.
c.ScheduledPodLister.Store, c.scheduledPodPopulator = framework.NewInformer( c.ScheduledPodLister.Store, c.scheduledPodPopulator = framework.NewInformer(
c.createAssignedPodLW(), c.createAssignedNonTerminatedPodLW(),
&api.Pod{}, &api.Pod{},
0, 0,
framework.ResourceEventHandlerFuncs{ framework.ResourceEventHandlerFuncs{
@ -200,7 +200,7 @@ func (f *ConfigFactory) CreateFromKeys(predicateKeys, priorityKeys sets.String,
} }
// Watch and queue pods that need scheduling. // Watch and queue pods that need scheduling.
cache.NewReflector(f.createUnassignedPodLW(), &api.Pod{}, f.PodQueue, 0).RunUntil(f.StopEverything) cache.NewReflector(f.createUnassignedNonTerminatedPodLW(), &api.Pod{}, f.PodQueue, 0).RunUntil(f.StopEverything)
// Begin populating scheduled pods. // Begin populating scheduled pods.
go f.scheduledPodPopulator.Run(f.StopEverything) go f.scheduledPodPopulator.Run(f.StopEverything)
@ -283,16 +283,17 @@ func getNodeConditionPredicate() cache.NodeConditionPredicate {
// Returns a cache.ListWatch that finds all pods that need to be // Returns a cache.ListWatch that finds all pods that need to be
// scheduled. // scheduled.
func (factory *ConfigFactory) createUnassignedPodLW() *cache.ListWatch { func (factory *ConfigFactory) createUnassignedNonTerminatedPodLW() *cache.ListWatch {
return cache.NewListWatchFromClient(factory.Client, "pods", api.NamespaceAll, fields.Set{client.PodHost: ""}.AsSelector()) selector := fields.ParseSelectorOrDie("spec.nodeName==" + "" + ",status.phase!=" + string(api.PodSucceeded) + ",status.phase!=" + string(api.PodFailed))
return cache.NewListWatchFromClient(factory.Client, "pods", api.NamespaceAll, selector)
} }
// Returns a cache.ListWatch that finds all pods that are // Returns a cache.ListWatch that finds all pods that are
// already scheduled. // already scheduled.
// TODO: return a ListerWatcher interface instead? // TODO: return a ListerWatcher interface instead?
func (factory *ConfigFactory) createAssignedPodLW() *cache.ListWatch { func (factory *ConfigFactory) createAssignedNonTerminatedPodLW() *cache.ListWatch {
return cache.NewListWatchFromClient(factory.Client, "pods", api.NamespaceAll, selector := fields.ParseSelectorOrDie("spec.nodeName!=" + "" + ",status.phase!=" + string(api.PodSucceeded) + ",status.phase!=" + string(api.PodFailed))
fields.ParseSelectorOrDie(client.PodHost+"!=")) return cache.NewListWatchFromClient(factory.Client, "pods", api.NamespaceAll, selector)
} }
// createNodeLW returns a cache.ListWatch that gets all changes to nodes. // createNodeLW returns a cache.ListWatch that gets all changes to nodes.

32
plugin/pkg/scheduler/generic_scheduler_test.go
View File

@ -252,38 +252,6 @@ func TestGenericScheduler(t *testing.T) {
expectsErr: true, expectsErr: true,
name: "test 8", name: "test 8",
}, },
{
predicates: map[string]algorithm.FitPredicate{
"nopods": hasNoPodsPredicate,
"matches": matchesPredicate,
},
pods: []*api.Pod{
{
ObjectMeta: api.ObjectMeta{Name: "2"},
Spec: api.PodSpec{
NodeName: "2",
},
Status: api.PodStatus{
Phase: api.PodFailed,
},
},
{
ObjectMeta: api.ObjectMeta{Name: "3"},
Spec: api.PodSpec{
NodeName: "2",
},
Status: api.PodStatus{
Phase: api.PodSucceeded,
},
},
},
pod: &api.Pod{ObjectMeta: api.ObjectMeta{Name: "2"}},
prioritizers: []algorithm.PriorityConfig{{Function: numericPriority, Weight: 1}},
nodes: []string{"1", "2"},
expectedHost: "2",
name: "test 9",
},
} }
for _, test := range tests { for _, test := range tests {