Merge pull request kubernetes-retired#632 from hex108/bug

k8s-ci-robot · web-flow · commit 1e53499683be · 2019-03-11T03:09:26.000-07:00
Set schedConf to defaultSchedulerConf if failing to readSchedulerConf
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -70,6 +70,7 @@ func (pc *Scheduler) Run(stopCh <-chan struct{}) {
 		if schedConf, err = readSchedulerConf(pc.schedulerConf); err != nil {
 			glog.Errorf("Failed to read scheduler configuration '%s', using default configuration: %v",
 				pc.schedulerConf, err)
+			schedConf = defaultSchedulerConf
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ func (pc *Scheduler) Run(stopCh <-chan struct{}) {`
`70`	`70`	`if schedConf, err = readSchedulerConf(pc.schedulerConf); err != nil {`
`71`	`71`	`glog.Errorf("Failed to read scheduler configuration '%s', using default configuration: %v",`
`72`	`72`	`pc.schedulerConf, err)`
	`73`	`+ schedConf = defaultSchedulerConf`
`73`	`74`	`}`
`74`	`75`	`}`
`75`	`76`