Skip to content

Commit 0e1e964

Browse files
authored
verify fallback to default values if parameters are not defined in config file (#1111)
Signed-off-by: Nir Rozenbaum <[email protected]>
1 parent c972fc7 commit 0e1e964

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

pkg/epp/scheduling/framework/plugins/filter/lora_affinity_filter.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ var _ framework.Filter = &LoraAffinityFilter{}
4343
// LoraAffinityFilterFactory defines the factory function for LoraAffinityFilter.
4444
func LoraAffinityFilterFactory(name string, rawParameters json.RawMessage, _ plugins.Handle) (plugins.Plugin, error) {
4545
parameters := loraAffinityFilterParameters{Threshold: config.DefaultLoraAffinityThreshold}
46-
if err := json.Unmarshal(rawParameters, &parameters); err != nil {
47-
return nil, fmt.Errorf("failed to parse the parameters of the '%s' filter - %w", LoraAffinityFilterType, err)
46+
if rawParameters != nil {
47+
if err := json.Unmarshal(rawParameters, &parameters); err != nil {
48+
return nil, fmt.Errorf("failed to parse the parameters of the '%s' filter - %w", LoraAffinityFilterType, err)
49+
}
4850
}
4951
return NewLoraAffinityFilter(parameters.Threshold).WithName(name), nil
5052
}

pkg/epp/scheduling/framework/plugins/filter/low_queue_filter.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ var _ framework.Filter = &LowQueueFilter{}
4242
// LowQueueFilterFactory defines the factory function for LowQueueFilter.
4343
func LowQueueFilterFactory(name string, rawParameters json.RawMessage, _ plugins.Handle) (plugins.Plugin, error) {
4444
parameters := lowQueueFilterParameters{Threshold: config.DefaultQueueingThresholdLoRA}
45-
if err := json.Unmarshal(rawParameters, &parameters); err != nil {
46-
return nil, fmt.Errorf("failed to parse the parameters of the '%s' filter - %w", LowQueueFilterType, err)
45+
if rawParameters != nil {
46+
if err := json.Unmarshal(rawParameters, &parameters); err != nil {
47+
return nil, fmt.Errorf("failed to parse the parameters of the '%s' filter - %w", LowQueueFilterType, err)
48+
}
4749
}
4850

4951
return NewLowQueueFilter(parameters.Threshold).WithName(name), nil

pkg/epp/scheduling/framework/plugins/multi/prefix/plugin.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,11 @@ func PrefixCachePluginFactory(name string, rawParameters json.RawMessage, _ plug
125125
MaxPrefixBlocksToMatch: DefaultMaxPrefixBlocks,
126126
LRUCapacityPerServer: DefaultLRUCapacityPerServer,
127127
}
128-
if err := json.Unmarshal(rawParameters, &parameters); err != nil {
129-
return nil, fmt.Errorf("failed to parse the parameters of the %s plugin. Error: %s", PrefixCachePluginType, err)
128+
129+
if rawParameters != nil {
130+
if err := json.Unmarshal(rawParameters, &parameters); err != nil {
131+
return nil, fmt.Errorf("failed to parse the parameters of the %s plugin. Error: %s", PrefixCachePluginType, err)
132+
}
130133
}
131134

132135
return New(parameters).WithName(name), nil

0 commit comments

Comments
 (0)