Merge pull request kubernetes#23261 from hongchaodeng/sched

k8s-merge-robot · k8s-merge-robot · commit bf0e6e0047c1 · 2016-04-11T10:01:16.000-07:00
Automatic merge from submit-queue kube-scheduler: cleanup duplicate GetAlgorithmProvider() See [here](https://github.com/kubernetes/kubernetes/blob/ae88f08af09b8e721913544dcc2afdc31f98635e/plugin/pkg/scheduler/factory/factory.go#L177-L180). The check is duplicate since CreateFromProvider will also do it.
diff --git a/plugin/cmd/kube-scheduler/app/server.go b/plugin/cmd/kube-scheduler/app/server.go
@@ -176,11 +176,5 @@ func createConfig(s *options.SchedulerServer, configFactory *factory.ConfigFacto
 	}
 
 	// if the config file isn't provided, use the specified (or default) provider
-	// check of algorithm provider is registered and fail fast
-	_, err := factory.GetAlgorithmProvider(s.AlgorithmProvider)
-	if err != nil {
-		return nil, err
-	}
-
 	return configFactory.CreateFromProvider(s.AlgorithmProvider)
 }

Original file line number	Diff line number	Diff line change
`@@ -176,11 +176,5 @@ func createConfig(s options.SchedulerServer, configFactory factory.ConfigFacto`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`// if the config file isn't provided, use the specified (or default) provider`
`179`		`- // check of algorithm provider is registered and fail fast`
`180`		`- _, err := factory.GetAlgorithmProvider(s.AlgorithmProvider)`
`181`		`- if err != nil {`
`182`		`- return nil, err`
`183`		`- }`
`184`		`-`
`185`	`179`	`return configFactory.CreateFromProvider(s.AlgorithmProvider)`
`186`	`180`	`}`