Scheduler: move more to internaltypes.ResourceList #4036
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Robert Smith <robertdavidsmith@yahoo.com>
Signed-off-by: Robert Smith <robertdavidsmith@yahoo.com>
Signed-off-by: Robert Smith <robertdavidsmith@yahoo.com>
Signed-off-by: Robert Smith <robertdavidsmith@yahoo.com>
robertdavidsmith
commented
Nov 7, 2024
| @@ -182,10 +182,6 @@ type FairSchedulingAlgoContext struct { | |||
| Txn *jobdb.Txn | |||
| } | |||
|
|
|||
| func (l *FairSchedulingAlgo) NewFairSchedulingAlgoContext(ctx *armadacontext.Context, txn *jobdb.Txn, pool configuration.PoolConfig) (*FairSchedulingAlgoContext, error) { | |||
There was a problem hiding this comment.
Method NewFairSchedulingAlgoContext is unused
Signed-off-by: Robert Smith <robertdavidsmith@yahoo.com>
Signed-off-by: Robert Smith <robertdavidsmith@yahoo.com>
… sched-more-it-rl
Signed-off-by: Robert Smith <robertdavidsmith@yahoo.com>
robertdavidsmith
commented
Nov 8, 2024
| @@ -266,17 +304,6 @@ func (rl ResourceList) Negate() ResourceList { | |||
| return ResourceList{factory: rl.factory, resources: result} | |||
| } | |||
|
|
|||
| func (rl ResourceList) Scale(factor float64) ResourceList { | |||
There was a problem hiding this comment.
Scale() is unused
robertdavidsmith
commented
Nov 8, 2024
| @@ -389,98 +373,18 @@ func makeConstraintsTest(constraints SchedulingConstraints) *constraintTest { | |||
| } | |||
| } | |||
|
|
|||
| func TestIsStrictlyLessOrEqual(t *testing.T) { | |||
There was a problem hiding this comment.
method IsStrictlyLessOrEqual has been deleted
robertdavidsmith
commented
Nov 8, 2024
| AllocatedByPriorityClass schedulerobjects.QuantityByTAndResourceType[string] | ||
| // Total away resources assigned to the queue across all clusters by priority class. | ||
| // Includes away jobs scheduled during this invocation of the scheduler. | ||
| AwayAllocatedByPriorityClass schedulerobjects.QuantityByTAndResourceType[string] |
There was a problem hiding this comment.
AwayAllocatedByPriorityClass is unused
JamesMurkin
reviewed
Nov 8, 2024
| return priorityClassConstraint.MaximumResourcesPerQueue | ||
| maximumResourceFractionToSchedule := config.MaximumResourceFractionToSchedule | ||
| if m, ok := config.MaximumResourceFractionToScheduleByPool[pool]; ok { | ||
| // Use pool-specific config is available. |
There was a problem hiding this comment.
Suggested change
| // Use pool-specific config is available. | |
| // Use pool-specific config if available. |
JamesMurkin
approved these changes
Nov 8, 2024
robertdavidsmith
commented
Nov 8, 2024
| @@ -2104,7 +2113,8 @@ func TestPreemptingQueueScheduler(t *testing.T) { | |||
| ) | |||
| } | |||
| for queue, qctx := range sctx.QueueSchedulingContexts { | |||
| assert.True(t, qctx.AllocatedByPriorityClass.Equal(allocatedByQueueAndPriorityClass[queue])) | |||
| m := internaltypes.RlMapFromJobSchedulerObjects(allocatedByQueueAndPriorityClass[queue], testfixtures.TestResourceListFactory) | |||
| assert.Equal(t, internaltypes.RlMapRemoveZeros(m), internaltypes.RlMapRemoveZeros(qctx.AllocatedByPriorityClass)) | |||
There was a problem hiding this comment.
The old schedulerobjects Equal methods treat missing and zero as the same. For now, reproduce the old behavior by removing any zero resourcelists from the map
robertdavidsmith
commented
Nov 8, 2024
| } | ||
| return total | ||
| } | ||
|
|
There was a problem hiding this comment.
TotalResources is unused
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.