Merge pull request #541 from sivanzcw/bugfix

Pipeline task if task's request resource less than the releasing resource of node during performing allocate action
volcano-sh · Dec 19, 2019 · ba6677b · ba6677b
2 parents b3f3809 + 2ac5432
commit ba6677b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/scheduler/actions/allocate/allocate.go b/pkg/scheduler/actions/allocate/allocate.go
@@ -216,9 +216,9 @@ func (alloc *allocateAction) Execute(ssn *framework.Session) {
 				if task.InitResreq.LessEqual(node.FutureIdle()) {
 					klog.V(3).Infof("Pipelining Task <%v/%v> to node <%v> for <%v> on <%v>",
 						task.Namespace, task.Name, node.Name, task.InitResreq, node.Releasing)
-					if err := stmt.Pipeline(task, node.Name); err != nil {
-						klog.Errorf("Failed to pipeline Task %v on %v",
-							task.UID, node.Name)
+					if err := ssn.Pipeline(task, node.Name); err != nil {
+						klog.Errorf("Failed to pipeline Task %v on %v in Session %v for %v.",
+							task.UID, node.Name, ssn.UID, err)
 					}
 				}
 			}

diff --git a/test/e2e/job_scheduling.go b/test/e2e/job_scheduling.go
@@ -189,6 +189,7 @@ var _ = Describe("Job E2E Test", func() {
 
 		job.name = "preemptor-qj"
 		job.pri = masterPriority
+		job.min = rep / 2
 		job2 := createJob(context, job)
 		err = waitTasksReady(context, job1, int(rep)/2)
 		Expect(err).NotTo(HaveOccurred())
@@ -229,6 +230,7 @@ var _ = Describe("Job E2E Test", func() {
 
 		job.name = "multipreemptor-qj1"
 		job.pri = masterPriority
+		job.min = rep / 3
 		job2 := createJob(context, job)
 		Expect(err).NotTo(HaveOccurred())