Skip to content

Commit ba6677b

Browse files
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
2 parents b3f3809 + 2ac5432 commit ba6677b

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

pkg/scheduler/actions/allocate/allocate.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ func (alloc *allocateAction) Execute(ssn *framework.Session) {
216216
if task.InitResreq.LessEqual(node.FutureIdle()) {
217217
klog.V(3).Infof("Pipelining Task <%v/%v> to node <%v> for <%v> on <%v>",
218218
task.Namespace, task.Name, node.Name, task.InitResreq, node.Releasing)
219-
if err := stmt.Pipeline(task, node.Name); err != nil {
220-
klog.Errorf("Failed to pipeline Task %v on %v",
221-
task.UID, node.Name)
219+
if err := ssn.Pipeline(task, node.Name); err != nil {
220+
klog.Errorf("Failed to pipeline Task %v on %v in Session %v for %v.",
221+
task.UID, node.Name, ssn.UID, err)
222222
}
223223
}
224224
}

test/e2e/job_scheduling.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ var _ = Describe("Job E2E Test", func() {
189189

190190
job.name = "preemptor-qj"
191191
job.pri = masterPriority
192+
job.min = rep / 2
192193
job2 := createJob(context, job)
193194
err = waitTasksReady(context, job1, int(rep)/2)
194195
Expect(err).NotTo(HaveOccurred())
@@ -229,6 +230,7 @@ var _ = Describe("Job E2E Test", func() {
229230

230231
job.name = "multipreemptor-qj1"
231232
job.pri = masterPriority
233+
job.min = rep / 3
232234
job2 := createJob(context, job)
233235
Expect(err).NotTo(HaveOccurred())
234236

0 commit comments

Comments
 (0)