Merge pull request volcano-sh#3307 from Lily922/master-config

change private function 'unmarshalSchedulerConf' to public function 'UnmarshalSchedulerConf'
D0m021ng · Feb 28, 2024 · 6e9f4f6 · 6e9f4f6
2 parents 94c62a4 + 730d548
commit 6e9f4f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -137,9 +137,9 @@ func (pc *Scheduler) loadSchedulerConf() {
 
 	var err error
 	pc.once.Do(func() {
-		pc.actions, pc.plugins, pc.configurations, pc.metricsConf, err = unmarshalSchedulerConf(defaultSchedulerConf)
+		pc.actions, pc.plugins, pc.configurations, pc.metricsConf, err = UnmarshalSchedulerConf(DefaultSchedulerConf)
 		if err != nil {
-			klog.Errorf("unmarshal Scheduler config %s failed: %v", defaultSchedulerConf, err)
+			klog.Errorf("unmarshal Scheduler config %s failed: %v", DefaultSchedulerConf, err)
 			panic("invalid default configuration")
 		}
 	})
@@ -155,7 +155,7 @@ func (pc *Scheduler) loadSchedulerConf() {
 		config = strings.TrimSpace(string(confData))
 	}
 
-	actions, plugins, configurations, metricsConf, err := unmarshalSchedulerConf(config)
+	actions, plugins, configurations, metricsConf, err := UnmarshalSchedulerConf(config)
 	if err != nil {
 		klog.Errorf("Scheduler config %s is invalid: %v", config, err)
 		return

diff --git a/pkg/scheduler/util.go b/pkg/scheduler/util.go
@@ -30,7 +30,7 @@ import (
 	"volcano.sh/volcano/pkg/util"
 )
 
-var defaultSchedulerConf = `
+var DefaultSchedulerConf = `
 actions: "enqueue, allocate, backfill"
 tiers:
 - plugins:
@@ -45,7 +45,7 @@ tiers:
   - name: nodeorder
 `
 
-func unmarshalSchedulerConf(confStr string) ([]framework.Action, []conf.Tier, []conf.Configuration, map[string]string, error) {
+func UnmarshalSchedulerConf(confStr string) ([]framework.Action, []conf.Tier, []conf.Configuration, map[string]string, error) {
 	var actions []framework.Action
 
 	schedulerConf := &conf.SchedulerConfiguration{}

diff --git a/pkg/scheduler/util_test.go b/pkg/scheduler/util_test.go
@@ -193,7 +193,7 @@ tiers:
 
 	var expectedConfigurations []conf.Configuration
 
-	_, tiers, configurations, _, err := unmarshalSchedulerConf(configuration)
+	_, tiers, configurations, _, err := UnmarshalSchedulerConf(configuration)
 	if err != nil {
 		t.Errorf("Failed to load Scheduler configuration: %v", err)
 	}