more minor review feedback

api/jobs.go

@@ -1024,7 +1024,7 @@ type DesiredUpdates struct {
 	InPlaceUpdate     uint64
 	DestructiveUpdate uint64
 	Canary            uint64
-	Evict             uint64
+	Preemptions       uint64
 }
 
 type JobDispatchRequest struct {

nomad/leader.go

@@ -42,8 +42,12 @@ const (
 
 var minAutopilotVersion = version.Must(version.NewVersion("0.8.0"))
 
-// Default configuration for scheduler with preemption emabled for system jobs
-var defaultSchedulerConfig = &structs.SchedulerConfiguration{PreemptionConfig: structs.PreemptionConfig{SystemSchedulerEnabled: true}}
+// Default configuration for scheduler with preemption enabled for system jobs
+var defaultSchedulerConfig = &structs.SchedulerConfiguration{
+	PreemptionConfig: structs.PreemptionConfig{
+		SystemSchedulerEnabled: true,
+	},
+}
 
 // monitorLeadership is used to monitor if we acquire or lose our role
 // as the leader in the Raft cluster. There is some work the leader is
@@ -1237,7 +1241,8 @@ func (s *Server) getOrCreateAutopilotConfig() *structs.AutopilotConfig {
 	return config
 }
 
-// getOrCreateSchedulerConfig is used to get the scheduler config, initializing it if necessary
+// getOrCreateSchedulerConfig is used to get the scheduler config. We create a default
+// config if it doesn't already exist for bootstrapping an empty cluster
 func (s *Server) getOrCreateSchedulerConfig() *structs.SchedulerConfiguration {
 	state := s.fsm.State()
 	_, config, err := state.SchedulerConfig()

nomad/state/state_store.go

@@ -3889,9 +3889,9 @@ func (s *StateStore) SchedulerSetConfig(idx uint64, config *structs.SchedulerCon
 	return nil
 }
 
-// SchedulerCASConfig is used to try updating the scheduler configuration with a
+// SchedulerCASConfig is used to update the scheduler configuration with a
 // given Raft index. If the CAS index specified is not equal to the last observed index
-// for the config, then the call is a noop,
+// for the config, then the call is a noop.
 func (s *StateStore) SchedulerCASConfig(idx, cidx uint64, config *structs.SchedulerConfiguration) (bool, error) {
 	tx := s.db.Txn(true)
 	defer tx.Abort()

nomad/structs/structs.go

@@ -8176,6 +8176,7 @@ func (p *Plan) AppendPreemptedAlloc(alloc *Allocation, desiredStatus, preempting
 	if alloc.AllocatedResources != nil {
 		newAlloc.AllocatedResources = alloc.AllocatedResources
 	} else {
+		// COMPAT Remove in version 0.11
 		newAlloc.TaskResources = alloc.TaskResources
 		newAlloc.SharedResources = alloc.SharedResources
 	}