Merge pull request #2236 from william-wang/sunset-elect

sunset the reservation plugin and elect reserve actions
volcano-sh · May 14, 2022 · c9f1c1b · c9f1c1b
2 parents 87148e0 + b27b4bb
commit c9f1c1b
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 434 deletions.
diff --git a/pkg/scheduler/actions/allocate/allocate.go b/pkg/scheduler/actions/allocate/allocate.go
@@ -25,8 +25,6 @@ import (
 	"volcano.sh/volcano/pkg/scheduler/util"
 )
 
-var targetJob = util.Reservation.TargetJob
-
 type Action struct{}
 
 func New() *Action {
@@ -98,18 +96,6 @@ func (alloc *Action) Execute(ssn *framework.Session) {
 	pendingTasks := map[api.JobID]*util.PriorityQueue{}
 
 	allNodes := ssn.NodeList
-	unlockedNodes := allNodes
-	if targetJob != nil && len(util.Reservation.LockedNodes) != 0 {
-		unlockedNodes = unlockedNodes[0:0]
-		for _, node := range allNodes {
-			if _, exist := util.Reservation.LockedNodes[node.Name]; !exist {
-				unlockedNodes = append(unlockedNodes, node)
-			}
-		}
-	}
-	for _, unlockedNode := range unlockedNodes {
-		klog.V(4).Infof("unlockedNode ID: %s, Name: %s", unlockedNode.Node.UID, unlockedNode.Node.Name)
-	}
 	predicateFn := func(task *api.TaskInfo, node *api.NodeInfo) error {
 		// Check for Resource Predicate
 		if !task.InitResreq.LessEqual(node.FutureIdle(), api.Zero) {
@@ -171,13 +157,6 @@ func (alloc *Action) Execute(ssn *framework.Session) {
 		}
 
 		job := jobs.Pop().(*api.JobInfo)
-		var nodes []*api.NodeInfo
-		if targetJob != nil && job.UID == targetJob.UID {
-			klog.V(4).Infof("Try to allocate resource to target job: %s", job.Name)
-			nodes = allNodes
-		} else {
-			nodes = unlockedNodes
-		}
 		if _, found = pendingTasks[job.UID]; !found {
 			tasks := util.NewPriorityQueue(ssn.TaskOrderFn)
 			for _, task := range job.TaskStatusIndex[api.Pending] {
@@ -207,9 +186,9 @@ func (alloc *Action) Execute(ssn *framework.Session) {
 				continue
 			}
 
-			klog.V(3).Infof("There are <%d> nodes for Job <%v/%v>", len(nodes), job.Namespace, job.Name)
+			klog.V(3).Infof("There are <%d> nodes for Job <%v/%v>", len(ssn.Nodes), job.Namespace, job.Name)
 
-			predicateNodes, fitErrors := ph.PredicateNodes(task, nodes, predicateFn)
+			predicateNodes, fitErrors := ph.PredicateNodes(task, allNodes, predicateFn)
 			if len(predicateNodes) == 0 {
 				job.NodesFitErrors[task.UID] = fitErrors
 				break

diff --git a/pkg/scheduler/actions/elect/elect.go b/pkg/scheduler/actions/elect/elect.go
diff --git a/pkg/scheduler/actions/elect/elect_test.go b/pkg/scheduler/actions/elect/elect_test.go
diff --git a/pkg/scheduler/actions/factory.go b/pkg/scheduler/actions/factory.go
@@ -19,11 +19,9 @@ package actions
 import (
 	"volcano.sh/volcano/pkg/scheduler/actions/allocate"
 	"volcano.sh/volcano/pkg/scheduler/actions/backfill"
-	"volcano.sh/volcano/pkg/scheduler/actions/elect"
 	"volcano.sh/volcano/pkg/scheduler/actions/enqueue"
 	"volcano.sh/volcano/pkg/scheduler/actions/preempt"
 	"volcano.sh/volcano/pkg/scheduler/actions/reclaim"
-	"volcano.sh/volcano/pkg/scheduler/actions/reserve"
 	"volcano.sh/volcano/pkg/scheduler/actions/shuffle"
 	"volcano.sh/volcano/pkg/scheduler/framework"
 )
@@ -34,7 +32,5 @@ func init() {
 	framework.RegisterAction(backfill.New())
 	framework.RegisterAction(preempt.New())
 	framework.RegisterAction(enqueue.New())
-	framework.RegisterAction(elect.New())
-	framework.RegisterAction(reserve.New())
 	framework.RegisterAction(shuffle.New())
 }
diff --git a/pkg/scheduler/actions/reserve/reserve.go b/pkg/scheduler/actions/reserve/reserve.go
diff --git a/pkg/scheduler/plugins/factory.go b/pkg/scheduler/plugins/factory.go
@@ -30,7 +30,6 @@ import (
 	"volcano.sh/volcano/pkg/scheduler/plugins/priority"
 	"volcano.sh/volcano/pkg/scheduler/plugins/proportion"
 	"volcano.sh/volcano/pkg/scheduler/plugins/rescheduling"
-	"volcano.sh/volcano/pkg/scheduler/plugins/reservation"
 	"volcano.sh/volcano/pkg/scheduler/plugins/resourcequota"
 	"volcano.sh/volcano/pkg/scheduler/plugins/sla"
 	tasktopology "volcano.sh/volcano/pkg/scheduler/plugins/task-topology"
@@ -47,7 +46,6 @@ func init() {
 	framework.RegisterPluginBuilder(nodeorder.PluginName, nodeorder.New)
 	framework.RegisterPluginBuilder(conformance.PluginName, conformance.New)
 	framework.RegisterPluginBuilder(binpack.PluginName, binpack.New)
-	framework.RegisterPluginBuilder(reservation.PluginName, reservation.New)
 	framework.RegisterPluginBuilder(tdm.PluginName, tdm.New)
 	framework.RegisterPluginBuilder(overcommit.PluginName, overcommit.New)
 	framework.RegisterPluginBuilder(sla.PluginName, sla.New)