github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Update generic_scheduler.go

Browse Source
This commit is contained in:
PingWang 2016-05-23 09:18:15 +08:00
parent 36740719d9
commit e2af16b1d5
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,6 @@ func findNodesThatFit(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.No
filtered := []api.Node{} filtered := []api.Node{}
failedPredicateMap := FailedPredicateMap{} failedPredicateMap := FailedPredicateMap{}
//wp:#25606
if len(predicateFuncs) == 0 { if len(predicateFuncs) == 0 {
filtered = nodes.Items filtered = nodes.Items
} else { } else {
@ -174,24 +173,6 @@ func findNodesThatFit(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.No
if err != nil { if err != nil {
return api.NodeList{}, FailedPredicateMap{}, err return api.NodeList{}, FailedPredicateMap{}, err
} }
//add the extender failed info to failedPredicateMap wp:#25797
for _, filteredNode := range filtered {
nodeIn := false
for _, exNode := range filteredList.Items {
if filteredNode.Name == exNode.Name {
nodeIn = true
break
}
}
if !nodeIn {
if re, ok := extender.(*HTTPExtender); ok {
failedPredicateMap[filteredNode.Name] = fmt.Sprintf("%s, %s", re.extenderURL, re.filterVerb)
} else {
failedPredicateMap[filteredNode.Name] = "extender failed"
}
}
}
filtered = filteredList.Items filtered = filteredList.Items
if len(filtered) == 0 { if len(filtered) == 0 {
break break