luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Cleanup system job loop

Browse source
This commit is contained in:
Alex Dadgar 2015-10-20 13:02:55 -07:00
parent 91a8528bba
commit fcee850c2b
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
nomad/node_endpoint.go
View file

@ -448,11 +448,11 @@ func (n *Node) createNodeEvals(nodeID string, nodeIndex uint64) ([]string, uint6
return nil, 0, fmt.Errorf("failed to find allocs for '%s': %v", nodeID, err) return nil, 0, fmt.Errorf("failed to find allocs for '%s': %v", nodeID, err)
} }
sysJobs, err := snap.JobsByScheduler("system") sysJobsIter, err := snap.JobsByScheduler("system")
if err != nil { if err != nil {
return nil, 0, fmt.Errorf("failed to find system jobs for '%s': %v", nodeID, err) return nil, 0, fmt.Errorf("failed to find system jobs for '%s': %v", nodeID, err)
} }
nextJob := sysJobs.Next() nextJob := sysJobsIter.Next()
// Fast-path if nothing to do // Fast-path if nothing to do
if len(allocs) == 0 && nextJob == nil { if len(allocs) == 0 && nextJob == nil {
@ -486,35 +486,35 @@ func (n *Node) createNodeEvals(nodeID string, nodeIndex uint64) ([]string, uint6
evalIDs = append(evalIDs, eval.ID) evalIDs = append(evalIDs, eval.ID)
} }
var sysJobs []*structs.Job
if nextJob != nil {
sysJobs = append(sysJobs, nextJob.(*structs.Job))
for job := sysJobsIter.Next(); job != nil; job = sysJobsIter.Next() {
sysJobs = append(sysJobs, job.(*structs.Job))
}
}
// Create an evaluation for each system job. // Create an evaluation for each system job.
curSysJob := nextJob.(*structs.Job) for _, job := range sysJobs {
for job := sysJobs.Next(); ; {
// Still dedup on JobID as the node may already have the system job. // Still dedup on JobID as the node may already have the system job.
if _, ok := jobIDs[curSysJob.ID]; ok { if _, ok := jobIDs[job.ID]; ok {
continue continue
} }
jobIDs[curSysJob.ID] = struct{}{} jobIDs[job.ID] = struct{}{}
// Create a new eval // Create a new eval
eval := &structs.Evaluation{ eval := &structs.Evaluation{
ID: structs.GenerateUUID(), ID: structs.GenerateUUID(),
Priority: curSysJob.Priority, Priority: job.Priority,
Type: curSysJob.Type, Type: job.Type,
TriggeredBy: structs.EvalTriggerNodeUpdate, TriggeredBy: structs.EvalTriggerNodeUpdate,
JobID: curSysJob.ID, JobID: job.ID,
NodeID: nodeID, NodeID: nodeID,
NodeModifyIndex: nodeIndex, NodeModifyIndex: nodeIndex,
Status: structs.EvalStatusPending, Status: structs.EvalStatusPending,
} }
evals = append(evals, eval) evals = append(evals, eval)
evalIDs = append(evalIDs, eval.ID) evalIDs = append(evalIDs, eval.ID)
// Update the current system job for the next iteration.
if job == nil {
break
}
curSysJob = job.(*structs.Job)
} }
// Create the Raft transaction // Create the Raft transaction