Eliminate queue with no suitable jobs from scheduling. (#317)

armadaproject · Feb 28, 2020 · f1ff169 · f1ff169
1 parent eb09919
commit f1ff169
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/internal/armada/server/lease.go b/internal/armada/server/lease.go
@@ -227,11 +227,14 @@ func (q *AggregatedQueueServer) distributeRemainder(lc *leaseContext, limit int)
  }
  if len(leased) > 0 {
  emptySteps = 0
+ jobs = append(jobs, leased...)
+ scheduledShare := scheduling.ResourcesFloatAsUsage(lc.resourceScarcity, remainder) - scheduling.ResourcesFloatAsUsage(lc.resourceScarcity, remaining)
+ shares[queue] = math.Max(0, shares[queue]-scheduledShare)
+ remainder = remaining
+ } else {
+ // if there are no suitable jobs to lease eliminate queue from the scheduling
+ shares[queue] = 0
  }
- jobs = append(jobs, leased...)
- scheduledShare := scheduling.ResourcesFloatAsUsage(lc.resourceScarcity, remainder) - scheduling.ResourcesFloatAsUsage(lc.resourceScarcity, remaining)
- shares[queue] = math.Max(0, shares[queue]-scheduledShare)
- remainder = remaining
 
  limit -= len(leased)
  if limit <= 0 || closeToDeadline(lc.ctx) {