forked from volcano-retired/scheduler
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kubernetes-retired#698 from hex108/plugin
Add support for setting default value to the configuration
- Loading branch information
Showing
6 changed files
with
232 additions
and
26 deletions.
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| Copyright 2019 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package plugins | ||
|
|
||
| import "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf" | ||
|
|
||
| // ApplyPluginConfDefaults sets option's filed to its default value if not set | ||
| func ApplyPluginConfDefaults(option *conf.PluginOption) { | ||
| t := true | ||
|
|
||
| if option.EnabledJobOrder == nil { | ||
| option.EnabledJobOrder = &t | ||
| } | ||
| if option.EnabledJobReady == nil { | ||
| option.EnabledJobReady = &t | ||
| } | ||
| if option.EnabledTaskOrder == nil { | ||
| option.EnabledTaskOrder = &t | ||
| } | ||
| if option.EnabledPreemptable == nil { | ||
| option.EnabledPreemptable = &t | ||
| } | ||
| if option.EnabledReclaimable == nil { | ||
| option.EnabledReclaimable = &t | ||
| } | ||
| if option.EnabledQueueOrder == nil { | ||
| option.EnabledQueueOrder = &t | ||
| } | ||
| if option.EnabledPredicate == nil { | ||
| option.EnabledPredicate = &t | ||
| } | ||
| if option.EnabledNodeOrder == nil { | ||
| option.EnabledNodeOrder = &t | ||
| } | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| /* | ||
| Copyright 2019 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package scheduler | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "testing" | ||
|
|
||
| _ "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/actions" | ||
| "github.com/kubernetes-sigs/kube-batch/pkg/scheduler/conf" | ||
| ) | ||
|
|
||
| func TestLoadSchedulerConf(t *testing.T) { | ||
| configuration := ` | ||
| actions: "allocate, backfill" | ||
| tiers: | ||
| - plugins: | ||
| - name: priority | ||
| - name: gang | ||
| - name: conformance | ||
| - plugins: | ||
| - name: drf | ||
| - name: predicates | ||
| - name: proportion | ||
| - name: nodeorder | ||
| ` | ||
|
|
||
| trueValue := true | ||
| expectedTiers := []conf.Tier{ | ||
| { | ||
| Plugins: []conf.PluginOption{ | ||
| { | ||
| Name: "priority", | ||
| EnabledJobOrder: &trueValue, | ||
| EnabledJobReady: &trueValue, | ||
| EnabledTaskOrder: &trueValue, | ||
| EnabledPreemptable: &trueValue, | ||
| EnabledReclaimable: &trueValue, | ||
| EnabledQueueOrder: &trueValue, | ||
| EnabledPredicate: &trueValue, | ||
| EnabledNodeOrder: &trueValue, | ||
| }, | ||
| { | ||
| Name: "gang", | ||
| EnabledJobOrder: &trueValue, | ||
| EnabledJobReady: &trueValue, | ||
| EnabledTaskOrder: &trueValue, | ||
| EnabledPreemptable: &trueValue, | ||
| EnabledReclaimable: &trueValue, | ||
| EnabledQueueOrder: &trueValue, | ||
| EnabledPredicate: &trueValue, | ||
| EnabledNodeOrder: &trueValue, | ||
| }, | ||
| { | ||
| Name: "conformance", | ||
| EnabledJobOrder: &trueValue, | ||
| EnabledJobReady: &trueValue, | ||
| EnabledTaskOrder: &trueValue, | ||
| EnabledPreemptable: &trueValue, | ||
| EnabledReclaimable: &trueValue, | ||
| EnabledQueueOrder: &trueValue, | ||
| EnabledPredicate: &trueValue, | ||
| EnabledNodeOrder: &trueValue, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| Plugins: []conf.PluginOption{ | ||
| { | ||
| Name: "drf", | ||
| EnabledJobOrder: &trueValue, | ||
| EnabledJobReady: &trueValue, | ||
| EnabledTaskOrder: &trueValue, | ||
| EnabledPreemptable: &trueValue, | ||
| EnabledReclaimable: &trueValue, | ||
| EnabledQueueOrder: &trueValue, | ||
| EnabledPredicate: &trueValue, | ||
| EnabledNodeOrder: &trueValue, | ||
| }, | ||
| { | ||
| Name: "predicates", | ||
| EnabledJobOrder: &trueValue, | ||
| EnabledJobReady: &trueValue, | ||
| EnabledTaskOrder: &trueValue, | ||
| EnabledPreemptable: &trueValue, | ||
| EnabledReclaimable: &trueValue, | ||
| EnabledQueueOrder: &trueValue, | ||
| EnabledPredicate: &trueValue, | ||
| EnabledNodeOrder: &trueValue, | ||
| }, | ||
| { | ||
| Name: "proportion", | ||
| EnabledJobOrder: &trueValue, | ||
| EnabledJobReady: &trueValue, | ||
| EnabledTaskOrder: &trueValue, | ||
| EnabledPreemptable: &trueValue, | ||
| EnabledReclaimable: &trueValue, | ||
| EnabledQueueOrder: &trueValue, | ||
| EnabledPredicate: &trueValue, | ||
| EnabledNodeOrder: &trueValue, | ||
| }, | ||
| { | ||
| Name: "nodeorder", | ||
| EnabledJobOrder: &trueValue, | ||
| EnabledJobReady: &trueValue, | ||
| EnabledTaskOrder: &trueValue, | ||
| EnabledPreemptable: &trueValue, | ||
| EnabledReclaimable: &trueValue, | ||
| EnabledQueueOrder: &trueValue, | ||
| EnabledPredicate: &trueValue, | ||
| EnabledNodeOrder: &trueValue, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| _, tiers, err := loadSchedulerConf(configuration) | ||
| if err != nil { | ||
| t.Errorf("Failed to load scheduler configuration: %v", err) | ||
| } | ||
| if !reflect.DeepEqual(tiers, expectedTiers) { | ||
| t.Errorf("Failed to set default settings for plugins, expected: %+v, got %+v", | ||
| expectedTiers, tiers) | ||
| } | ||
| } |