kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add SchedulerAlgorithm to SchedulerConfig

Browse Source
This commit is contained in:
Charlie Voiselle
2020-04-03 19:03:14 -04:00
committed by Mahmood Ali
parent 1bb731bdc5
commit 6571ccefbc
4 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
command/agent/operator_endpoint.go
View File

@@ -14,6 +14,8 @@ import (
"github.com/hashicorp/raft"
)
// OperatorRequest is used route operator/raft API requests to the implementing
// functions.
func (s *HTTPServer) OperatorRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
path := strings.TrimPrefix(req.URL.Path, "/v1/operator/raft/")
switch {
@@ -251,7 +253,12 @@ func (s *HTTPServer) schedulerUpdateConfig(resp http.ResponseWriter, req *http.R
return nil, CodedError(http.StatusBadRequest, fmt.Sprintf("Error parsing scheduler config: %v", err))
}
if !structs.SchedulerAlgorithmIsValid(conf.SchedulerAlgorithm) {
return nil, CodedError(http.StatusBadRequest, fmt.Sprintf("Invalid scheduler algorithm selected."))
}
args.Config = structs.SchedulerConfiguration{
SchedulerAlgorithm: conf.SchedulerAlgorithm,
PreemptionConfig: structs.PreemptionConfig{
SystemSchedulerEnabled: conf.PreemptionConfig.SystemSchedulerEnabled,
BatchSchedulerEnabled: conf.PreemptionConfig.BatchSchedulerEnabled,