Merge pull request #3458 from LivingCcj/master

ignore PredicateFn err info for preempt & reclaim scheduler plugin

pkg/scheduler/actions/preempt/preempt.go

@@ -209,13 +209,11 @@ func preempt(
 	}
 
 	predicateFn := func(task *api.TaskInfo, node *api.NodeInfo) ([]*api.Status, error) {
-		// Allows scheduling to nodes that are in Success or Unschedulable state after filtering by predicate.
 		var statusSets util.StatusSets
-		statusSets, err := ssn.PredicateFn(task, node)
-		if err != nil {
-			return nil, api.NewFitError(task, node, err.Error())
-		}
+		statusSets, _ = ssn.PredicateFn(task, node)
 
+		// When filtering candidate nodes, need to consider the node statusSets instead of the err information.
+		// refer to kube-scheduler preemption code: https://github.com/kubernetes/kubernetes/blob/9d87fa215d9e8020abdc17132d1252536cd752d2/pkg/scheduler/framework/preemption/preemption.go#L422
 		if statusSets.ContainsUnschedulableAndUnresolvable() || statusSets.ContainsErrorSkipOrWait() {
 			return nil, api.NewFitError(task, node, statusSets.Message())
 		}

pkg/scheduler/actions/reclaim/reclaim.go

@@ -128,14 +128,10 @@ func (ra *Action) Execute(ssn *framework.Session) {
 		assigned := false
 		for _, n := range ssn.Nodes {
 			var statusSets util.StatusSets
-			statusSets, err := ssn.PredicateFn(task, n)
-			if err != nil {
-				klog.V(5).Infof("reclaim predicates failed for task <%s/%s> on node <%s>: %v",
-					task.Namespace, task.Name, n.Name, err)
-				continue
-			}
+			statusSets, _ = ssn.PredicateFn(task, n)
 
-			// Allows scheduling to nodes that are in Success or Unschedulable state after filtering by predicate.
+			// When filtering candidate nodes, need to consider the node statusSets instead of the err information.
+			// refer to kube-scheduler preemption code: https://github.com/kubernetes/kubernetes/blob/9d87fa215d9e8020abdc17132d1252536cd752d2/pkg/scheduler/framework/preemption/preemption.go#L422
 			if statusSets.ContainsUnschedulableAndUnresolvable() || statusSets.ContainsErrorSkipOrWait() {
 				klog.V(5).Infof("predicates failed in reclaim for task <%s/%s> on node <%s>, reason is %s.",
 					task.Namespace, task.Name, n.Name, statusSets.Message())

pkg/scheduler/conf/scheduler_conf.go

@@ -65,9 +65,9 @@ type PluginOption struct {
 	EnablePreemptive *bool `yaml:"enablePreemptive"`
 	// EnabledQueueOrder defines whether queueOrderFn is enabled
 	EnabledQueueOrder *bool `yaml:"enableQueueOrder"`
-	// EnabledPredicate defines whether predicateFn is enabled
-	EnabledClusterOrder *bool `yaml:"EnabledClusterOrder"`
 	// EnableClusterOrder defines whether clusterOrderFn is enabled
+	EnabledClusterOrder *bool `yaml:"EnabledClusterOrder"`
+	// EnabledPredicate defines whether predicateFn is enabled
 	EnabledPredicate *bool `yaml:"enablePredicate"`
 	// EnabledBestNode defines whether bestNodeFn is enabled
 	EnabledBestNode *bool `yaml:"enableBestNode"`