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

Stop using index for task and task group validation

Browse source
This commit is contained in:
Kenjiro Nakayama 2016-07-20 22:23:35 +09:00
parent 3cd8d9d84e
commit 473eb6561a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nomad/structs/structs.go
View file

@ -1098,15 +1098,15 @@ func (j *Job) Validate() error {
if j.Type == "system" && tg.Count > 1 {
mErr.Errors = append(mErr.Errors,
fmt.Errorf("Job task group %d has count %d. Count cannot exceed 1 with system scheduler",
idx+1, tg.Count))
fmt.Errorf("Job task group %s has count %d. Count cannot exceed 1 with system scheduler",
tg.Name, tg.Count))
}
}
// Validate the task group
for idx, tg := range j.TaskGroups {
for _, tg := range j.TaskGroups {
if err := tg.Validate(); err != nil {
outer := fmt.Errorf("Task group %d validation failed: %s", idx+1, err)
outer := fmt.Errorf("Task group %s validation failed: %s", tg.Name, err)
mErr.Errors = append(mErr.Errors, outer)
}
}
@ -1482,9 +1482,9 @@ func (tg *TaskGroup) Validate() error {
}
// Validate the tasks
for idx, task := range tg.Tasks {
for _, task := range tg.Tasks {
if err := task.Validate(); err != nil {
outer := fmt.Errorf("Task %d validation failed: %s", idx+1, err)
outer := fmt.Errorf("Task %s validation failed: %s", task.Name, err)
mErr.Errors = append(mErr.Errors, outer)
}
}