fix some review comments, rename function name to PredicateForXXAction

Signed-off-by: lowang-bh <lhui_wang@163.com>
volcano-sh · Aug 1, 2024 · 2dff5d8 · 2dff5d8
1 parent 2b02a38
commit 2dff5d8
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/pkg/scheduler/actions/allocate/allocate.go b/pkg/scheduler/actions/allocate/allocate.go
@@ -310,7 +310,7 @@ func (alloc *Action) predicate(task *api.TaskInfo, node *api.NodeInfo) error {
 		statusSets = append(statusSets, &api.Status{Code: api.Unschedulable, Reason: api.WrapInsufficientResourceReason(resources)})
 		return api.NewFitErrWithStatus(task, node, statusSets...)
 	}
-	return alloc.session.PredicateWhenAllocate(task, node)
+	return alloc.session.PredicateForAllocateAction(task, node)
 }
 
 func (alloc *Action) UnInitialize() {}
diff --git a/pkg/scheduler/actions/backfill/backfill.go b/pkg/scheduler/actions/backfill/backfill.go
@@ -43,7 +43,7 @@ func (backfill *Action) Execute(ssn *framework.Session) {
 	klog.V(5).Infof("Enter Backfill ...")
 	defer klog.V(5).Infof("Leaving Backfill ...")
 
-	predicateFunc := ssn.PredicateWhenAllocate
+	predicateFunc := ssn.PredicateForAllocateAction
 
 	// TODO (k82cn): When backfill, it's also need to balance between Queues.
 	pendingTasks := backfill.pickUpPendingTasks(ssn)

diff --git a/pkg/scheduler/actions/preempt/preempt.go b/pkg/scheduler/actions/preempt/preempt.go
@@ -213,7 +213,7 @@ func preempt(
 		return false, fmt.Errorf("PrePredicate for task %s/%s failed for: %v", preemptor.Namespace, preemptor.Name, err)
 	}
 
-	predicateFn := ssn.PredicateWhenPreempt
+	predicateFn := ssn.PredicateForPreemptAction
 	// we should filter out those nodes that are UnschedulableAndUnresolvable status got in allocate action
 	allNodes := ssn.GetUnschedulableAndUnresolvableNodesForTask(preemptor)
 	predicateNodes, _ := predicateHelper.PredicateNodes(preemptor, allNodes, predicateFn, true)

diff --git a/pkg/scheduler/actions/reclaim/reclaim.go b/pkg/scheduler/actions/reclaim/reclaim.go
@@ -130,7 +130,8 @@ func (ra *Action) Execute(ssn *framework.Session) {
 		for _, n := range totalNodes {
 			// 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 err := ssn.PredicateWhenPreempt(task, n); err != nil {
+			if err := ssn.PredicateForPreemptAction(task, n); err != nil {
+				klog.V(4).Infof("Reclaim predicate for task %s/%s on node %s return error %v ", task.Namespace, task.Name, n.Name, err)
 				continue
 			}
 

diff --git a/pkg/scheduler/framework/session.go b/pkg/scheduler/framework/session.go
@@ -313,11 +313,11 @@ func (ssn *Session) GetUnschedulableAndUnresolvableNodesForTask(task *api.TaskIn
 	return ret
 }
 
-// PredicateWhenAllocate checks if the predicate error contains
+// PredicateForAllocateAction checks if the predicate error contains
 // - Unschedulable
 // - UnschedulableAndUnresolvable
 // - ErrorSkipOrWait
-func (ssn *Session) PredicateWhenAllocate(task *api.TaskInfo, node *api.NodeInfo) error {
+func (ssn *Session) PredicateForAllocateAction(task *api.TaskInfo, node *api.NodeInfo) error {
 	err := ssn.PredicateFn(task, node)
 	if err == nil {
 		return nil
@@ -336,10 +336,10 @@ func (ssn *Session) PredicateWhenAllocate(task *api.TaskInfo, node *api.NodeInfo
 	return nil
 }
 
-// PredicateWhenPreempt checks if the predicate error contains:
+// PredicateForPreemptAction checks if the predicate error contains:
 // - UnschedulableAndUnresolvable
 // - ErrorSkipOrWait
-func (ssn *Session) PredicateWhenPreempt(task *api.TaskInfo, node *api.NodeInfo) error {
+func (ssn *Session) PredicateForPreemptAction(task *api.TaskInfo, node *api.NodeInfo) error {
 	err := ssn.PredicateFn(task, node)
 	if err == nil {
 		return nil

diff --git a/pkg/scheduler/plugins/extender/extender.go b/pkg/scheduler/plugins/extender/extender.go
@@ -176,8 +176,8 @@ func (ep *extenderPlugin) OnSessionOpen(ssn *framework.Session) {
 			if len(resp.ErrorMessage) == 0 {
 				return nil
 			}
-			// keep compatibility with old behavior: error messages length is not zero
-			// but didn't return a code, and code will be 0 for default. Change code to zero for corresponding
+			// keep compatibility with old behavior: error messages length is not zero,
+			// but didn't return a code, and code will be 0 for default. Change code to Error for corresponding
 			if resp.Code == api.Success {
 				resp.Code = api.Error
 			}

diff --git a/pkg/scheduler/plugins/usage/usage.go b/pkg/scheduler/plugins/usage/usage.go
@@ -132,7 +132,6 @@ func (up *usagePlugin) OnSessionOpen(ssn *framework.Session) {
 			klog.V(4).Infof("The period(%s) is empty or the usage metrics data is not updated for more than %v minutes, "+
 				"Usage plugin filter for task %s/%s on node %s pass, metrics time is %v. ", up.period, MetricsActiveTime, task.Namespace, task.Name, node.Name, node.ResourceUsage.MetricsTime)
 
-			usageStatus.Code = api.Success
 			return nil
 		}