From e2af16b1d5358e71c10affeafb5e538df4ae67b5 Mon Sep 17 00:00:00 2001 From: PingWang Date: Mon, 23 May 2016 09:18:15 +0800 Subject: [PATCH] Update generic_scheduler.go --- plugin/pkg/scheduler/generic_scheduler.go | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/plugin/pkg/scheduler/generic_scheduler.go b/plugin/pkg/scheduler/generic_scheduler.go index fecb6fbf923..4c7288f4e59 100644 --- a/plugin/pkg/scheduler/generic_scheduler.go +++ b/plugin/pkg/scheduler/generic_scheduler.go @@ -140,7 +140,6 @@ func findNodesThatFit(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.No filtered := []api.Node{} failedPredicateMap := FailedPredicateMap{} - //wp:#25606 if len(predicateFuncs) == 0 { filtered = nodes.Items } else { @@ -174,24 +173,6 @@ func findNodesThatFit(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.No if err != nil { 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 if len(filtered) == 0 { break