Skip to content

Commit 0dbc246

Browse files
Merge pull request #638 from zionwu/remove-duplicated-code
Remove duplicated check in jobEnqueueableFn of proportion
2 parents 21d9188 + 09ea1ad commit 0dbc246

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

pkg/scheduler/plugins/proportion/proportion.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -218,16 +218,13 @@ func (pp *proportionPlugin) OnSessionOpen(ssn *framework.Session) {
218218
queue := ssn.Queues[queueID]
219219

220220
// If no capability is set, always enqueue the job.
221-
if len(queue.Queue.Spec.Capability) == 0 {
222-
return true
223-
}
224-
225-
pgResource := api.NewResource(*job.PodGroup.Spec.MinResources)
226221
if len(queue.Queue.Spec.Capability) == 0 {
227222
klog.V(4).Infof("Capability of queue <%s> was not set, allow job <%s/%s> to Inqueue.",
228223
queue.Name, job.Namespace, job.Name)
229224
return true
230225
}
226+
227+
pgResource := api.NewResource(*job.PodGroup.Spec.MinResources)
231228
// The queue resource quota limit has not reached
232229
if pgResource.Clone().Add(attr.allocated).LessEqual(api.NewResource(queue.Queue.Spec.Capability)) {
233230
return true

0 commit comments

Comments
 (0)