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

Merge pull request #5293 from hashicorp/b-dupe-resched

Browse Source 
cli: do not duplicate reschedule headers per group
This commit is contained in:
Michael Schurter
2019-02-01 09:45:44 -08:00
committed by GitHub
parent ff63b1aefe c40cb97dbc
commit f7be6e64fb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
command/job_status.go
View File

@@ -575,6 +575,7 @@ func (c *JobStatusCommand) outputReschedulingEvals(client *api.Client, job *api.
}
sort.Strings(taskGroups)
var evalDetails []string
first := true
for _, taskGroup := range taskGroups {
evalID := followUpEvalIds[taskGroup]
evaluation, _, err := client.Evaluations().Info(evalID, nil)
@@ -585,13 +586,18 @@ func (c *JobStatusCommand) outputReschedulingEvals(client *api.Client, job *api.
}
evalTime := prettyTimeDiff(evaluation.WaitUntil, time.Now())
if c.verbose {
delayedEvalInfos = append(delayedEvalInfos, "Task Group|Reschedule Policy|Eval ID|Eval Time")
if first {
delayedEvalInfos = append(delayedEvalInfos, "Task Group|Reschedule Policy|Eval ID|Eval Time")
}
rp := job.LookupTaskGroup(taskGroup).ReschedulePolicy
evalDetails = append(evalDetails, fmt.Sprintf("%s|%s|%s|%s", taskGroup, rp.String(), limit(evalID, uuidLength), evalTime))
} else {
delayedEvalInfos = append(delayedEvalInfos, "Task Group|Eval ID|Eval Time")
if first {
delayedEvalInfos = append(delayedEvalInfos, "Task Group|Eval ID|Eval Time")
}
evalDetails = append(evalDetails, fmt.Sprintf("%s|%s|%s", taskGroup, limit(evalID, uuidLength), evalTime))
}
first = false
}
if len(evalDetails) == 0 {
return nil