Skip to content

Commit 7136ee9

Browse files
committed
remove priority multiplier code
1 parent 7629005 commit 7136ee9

File tree

13 files changed

+3
-1279
lines changed

13 files changed

+3
-1279
lines changed

internal/scheduler/configuration/configuration.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,7 @@ type Configuration struct {
5555
DatabaseFetchSize int `validate:"required"`
5656
// Frequency at which queues will be fetched from the API
5757
QueueRefreshPeriod time.Duration `validate:"required"`
58-
// Allows queue priority multipliers to be fetched from an external source. This cannot be enabled at the same time
59-
// as PriorityOverrides
60-
PriorityMultiplier PriorityMultiplierConfig
61-
// Allows queue priority overrides to be fetched from an external source. This cannot be enabled at the same time
62-
// as PriorityMultipliers
58+
// Allows queue priority overrides to be fetched from an external source.
6359
PriorityOverride PriorityOverrideConfig
6460
}
6561

@@ -312,13 +308,6 @@ type ExperimentalIndicativePricing struct {
312308
BasePriority float64
313309
}
314310

315-
type PriorityMultiplierConfig struct {
316-
Enabled bool
317-
UpdateFrequency time.Duration
318-
ServiceUrl string
319-
ForceNoTls bool
320-
}
321-
322311
type PriorityOverrideConfig struct {
323312
Enabled bool
324313
UpdateFrequency time.Duration

internal/scheduler/mocks/generate.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@ package schedulermocks
77
//go:generate mockgen -destination=./executor_api.go -package=schedulermocks "github.com/armadaproject/armada/pkg/executorapi" ExecutorApi_LeaseJobRunsServer
88
//go:generate mockgen -destination=./queue_cache.go -package=schedulermocks "github.com/armadaproject/armada/internal/scheduler/queue" QueueCache
99
//go:generate mockgen -destination=./api.go -package=schedulermocks "github.com/armadaproject/armada/pkg/api" SubmitClient,Submit_GetQueuesClient
10-
//go:generate mockgen -destination=./priority_multiplier.go -package=schedulermocks "github.com/armadaproject/armada/pkg/priorityoverride" PriorityMultiplierServiceClient
1110
//go:generate mockgen -destination=./priority_override.go -package=schedulermocks "github.com/armadaproject/armada/pkg/priorityoverride" PriorityOverrideServiceClient

internal/scheduler/mocks/priority_multiplier.go

Lines changed: 0 additions & 63 deletions
This file was deleted.

internal/scheduler/prioritymultiplier/service_provider.go

Lines changed: 0 additions & 92 deletions
This file was deleted.

internal/scheduler/prioritymultiplier/service_provider_test.go

Lines changed: 0 additions & 115 deletions
This file was deleted.

internal/scheduler/prioritymultiplier/static_provider.go

Lines changed: 0 additions & 26 deletions
This file was deleted.

internal/scheduler/prioritymultiplier/static_provider_test.go

Lines changed: 0 additions & 34 deletions
This file was deleted.

internal/scheduler/prioritymultiplier/types.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)