Skip to content

Commit 7003812

Browse files
Merge pull request volcano-sh#23 from k82cn/vk_197
Enqueue jobs if Queue's capability is not set.
2 parents 9d8ffc5 + f58c7e6 commit 7003812

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

pkg/scheduler/plugins/proportion/proportion.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ func (pp *proportionPlugin) OnSessionOpen(ssn *framework.Session) {
181181
}
182182
allocated := allocations[job.Queue]
183183
if allocated.Less(reclaimee.Resreq) {
184-
glog.Errorf("Failed to allocate resource for Task <%s/%s> in Queue <%s> not enough resource.",
184+
glog.V(3).Infof("Failed to allocate resource for Task <%s/%s> in Queue <%s>, not enough resource.",
185185
reclaimee.Namespace, reclaimee.Name, job.Queue)
186186
continue
187187
}
@@ -213,6 +213,12 @@ func (pp *proportionPlugin) OnSessionOpen(ssn *framework.Session) {
213213
queueID := job.Queue
214214
attr := pp.queueOpts[queueID]
215215
queue := ssn.Queues[queueID]
216+
217+
// If no capability is set, always enqueue the job.
218+
if len(queue.Queue.Spec.Capability) == 0 {
219+
return true
220+
}
221+
216222
pgResource := api.NewResource(*job.PodGroup.Spec.MinResources)
217223
// The queue resource quota limit has not reached
218224
if pgResource.Clone().Add(attr.allocated).LessEqual(api.NewResource(queue.Queue.Spec.Capability)) {

0 commit comments

Comments
 (0)