Cleanup

armadaproject · Jun 22, 2023 · 3945a46 · 3945a46
1 parent 6e5d741
commit 3945a46
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/internal/scheduler/preempting_queue_scheduler_test.go b/internal/scheduler/preempting_queue_scheduler_test.go
@@ -1230,15 +1230,6 @@ func TestPreemptingQueueScheduler(t *testing.T) {
 				for queue, qctx := range sctx.QueueSchedulingContexts {
 					assert.True(t, qctx.AllocatedByPriorityClass.Equal(allocatedByQueueAndPriorityClass[queue]))
 				}
-				// for queue, allocated := range allocatedByQueueAndPriorityClass {
-				// 	// Filter out explicit zeros to enable comparing with expected allocation.
-				// 	allocatedByQueueAndPriorityClass[queue] = armadamaps.Filter(
-				// 		allocated,
-				// 		func(_ int32, rl schedulerobjects.ResourceList) bool {
-				// 			return !rl.IsZero()
-				// 		},
-				// 	)
-				// }
 
 				// Test that jobs are mapped to nodes correctly.
 				for _, job := range result.PreemptedJobs {

diff --git a/internal/scheduler/scheduling_algo.go b/internal/scheduler/scheduling_algo.go
@@ -280,7 +280,7 @@ func (l *FairSchedulingAlgo) newFairSchedulingAlgoContext(ctx context.Context, t
 	}
 
 	// Used to calculate fair share.
-	totalAllocationByPoolAndQueue := l.totalAllocationByPoolAndQueue(executors, jobsByExecutorId)
+	totalAllocationByPoolAndQueue := l.aggregateAllocationByPoolAndQueueAndPriorityClass(executors, jobsByExecutorId)
 
 	// Filter out any executor that isn't acknowledging jobs in a timely fashion
 	// Note that we do this after aggregating allocation across clusters for fair share.
@@ -520,8 +520,7 @@ func (l *FairSchedulingAlgo) filterLaggingExecutors(
 	return activeExecutors
 }
 
-// TODO: Rename
-func (l *FairSchedulingAlgo) totalAllocationByPoolAndQueue(executors []*schedulerobjects.Executor, jobsByExecutorId map[string][]*jobdb.Job) map[string]map[string]schedulerobjects.QuantityByTAndResourceType[string] {
+func (l *FairSchedulingAlgo) aggregateAllocationByPoolAndQueueAndPriorityClass(executors []*schedulerobjects.Executor, jobsByExecutorId map[string][]*jobdb.Job) map[string]map[string]schedulerobjects.QuantityByTAndResourceType[string] {
 	rv := make(map[string]map[string]schedulerobjects.QuantityByTAndResourceType[string])
 	for _, executor := range executors {
 		allocationByQueue := rv[executor.Pool]