Revert "dont hard code scheduler type name"

This reverts commit fb0e0df.
hashicorp · Oct 23, 2015 · 4718a05 · 4718a05
1 parent fb0e0df
commit 4718a05
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/nomad/node_endpoint.go b/nomad/node_endpoint.go
@@ -450,7 +450,7 @@ func (n *Node) createNodeEvals(nodeID string, nodeIndex uint64) ([]string, uint6
 		return nil, 0, fmt.Errorf("failed to find allocs for '%s': %v", nodeID, err)
 	}
 
-	sysJobsIter, err := snap.JobsByScheduler(structs.JobTypeSystem)
+	sysJobsIter, err := snap.JobsByScheduler("system")
 	if err != nil {
 		return nil, 0, fmt.Errorf("failed to find system jobs for '%s': %v", nodeID, err)
 	}

diff --git a/nomad/node_endpoint_test.go b/nomad/node_endpoint_test.go
@@ -207,8 +207,8 @@ func TestClientEndpoint_UpdateStatus_GetEvals(t *testing.T) {
 		t.Fatalf("could not get eval %v", evalID)
 	}
 
-	if eval.Type != structs.JobTypeSystem {
-		t.Fatalf("unexpected eval type; got %v; want %q", eval.Type, structs.JobTypeSystem)
+	if eval.Type != "system" {
+		t.Fatalf("unexpected eval type; got %v; want %q", eval.Type, "system")
 	}
 
 	// Check for heartbeat interval
@@ -605,7 +605,7 @@ func TestClientEndpoint_CreateNodeEvals(t *testing.T) {
 	for schedType, eval := range evalByType {
 		expPriority := alloc.Job.Priority
 		expJobID := alloc.JobID
-		if schedType == structs.JobTypeSystem {
+		if schedType == "system" {
 			expPriority = job.Priority
 			expJobID = job.ID
 		}

diff --git a/nomad/state/state_store_test.go b/nomad/state/state_store_test.go
@@ -387,7 +387,7 @@ func TestStateStore_JobsByScheduler(t *testing.T) {
 		outService = append(outService, raw.(*structs.Job))
 	}
 
-	iter, err = state.JobsByScheduler(structs.JobTypeSystem)
+	iter, err = state.JobsByScheduler("system")
 	if err != nil {
 		t.Fatalf("err: %v", err)
 	}

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -11,7 +11,6 @@ import (
 	"github.com/hashicorp/go-msgpack/codec"
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/go-version"
-	"github.com/hashicorp/nomad/nomad/structs"
 )
 
 var (
@@ -831,7 +830,7 @@ func (j *Job) Validate() error {
 			taskGroups[tg.Name] = idx
 		}
 
-		if j.Type == structs.JobTypeSystem && tg.Count != 1 {
+		if j.Type == "system" && tg.Count != 1 {
 			mErr.Errors = append(mErr.Errors,
 				fmt.Errorf("Job task group %d has count %d. Only count of 1 is supported with system scheduler",
 					idx+1, tg.Count))

diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go
@@ -11,9 +11,9 @@ import (
 // BuiltinSchedulers contains the built in registered schedulers
 // which are available
 var BuiltinSchedulers = map[string]Factory{
-	structs.JobTypeService: NewServiceScheduler,
-	structs.JobTypeBatch:   NewBatchScheduler,
-	structs.JobTypeSystem:  NewSystemScheduler,
+	"service": NewServiceScheduler,
+	"batch":   NewBatchScheduler,
+	"system":  NewSystemScheduler,
 }
 
 // NewScheduler is used to instantiate and return a new scheduler