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

Allow omitting resource block entirely

This commit is contained in:
Michael Schurter 2016-10-26 10:36:41 -07:00
parent 98600b5943
commit 3ea1fe8d20
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nomad/structs/structs.go
View File

@ -2103,7 +2103,9 @@ func (t *Task) Canonicalize(job *Job, tg *TaskGroup) {
service.Canonicalize(job.Name, tg.Name, t.Name) service.Canonicalize(job.Name, tg.Name, t.Name)
} }
if t.Resources != nil { if t.Resources == nil {
t.Resources = DefaultResources()
} else {
t.Resources.Canonicalize() t.Resources.Canonicalize()
} }
@ -2155,12 +2157,12 @@ func (t *Task) Validate(ephemeralDisk *EphemeralDisk) error {
// Validate the resources. // Validate the resources.
if t.Resources == nil { if t.Resources == nil {
mErr.Errors = append(mErr.Errors, errors.New("Missing task resources")) mErr.Errors = append(mErr.Errors, errors.New("Missing task resources"))
} else if err := t.Resources.MeetsMinResources(); err != nil { } else {
mErr.Errors = append(mErr.Errors, err) if err := t.Resources.MeetsMinResources(); err != nil {
} mErr.Errors = append(mErr.Errors, err)
}
// Ensure the task isn't asking for disk resources // Ensure the task isn't asking for disk resources
if t.Resources != nil {
if t.Resources.DiskMB > 0 { if t.Resources.DiskMB > 0 {
mErr.Errors = append(mErr.Errors, errors.New("Task can't ask for disk resources, they have to be specified at the task group level.")) mErr.Errors = append(mErr.Errors, errors.New("Task can't ask for disk resources, they have to be specified at the task group level."))
} }