Commit f555dc3f authored by Alex Dadgar's avatar Alex Dadgar
Browse files

Warn if IOPS is being used

parent 0953d913
No related merge requests found
Showing with 20 additions and 0 deletions
+20 -0
...@@ -853,6 +853,7 @@ func ApiResourcesToStructs(in *api.Resources) *structs.Resources { ...@@ -853,6 +853,7 @@ func ApiResourcesToStructs(in *api.Resources) *structs.Resources {
out := &structs.Resources{ out := &structs.Resources{
CPU: *in.CPU, CPU: *in.CPU,
MemoryMB: *in.MemoryMB, MemoryMB: *in.MemoryMB,
IOPS: *in.IOPS, // COMPAT(0.10): Only being used to issue warnings
} }
if l := len(in.Networks); l != 0 { if l := len(in.Networks); l != 0 {
......
...@@ -1698,6 +1698,7 @@ type Resources struct { ...@@ -1698,6 +1698,7 @@ type Resources struct {
CPU int CPU int
MemoryMB int MemoryMB int
DiskMB int DiskMB int
IOPS int // COMPAT(0.10): Only being used to issue warnings
Networks Networks Networks Networks
Devices []*RequestedDevice Devices []*RequestedDevice
} }
...@@ -4663,6 +4664,13 @@ func (tg *TaskGroup) Warnings(j *Job) error { ...@@ -4663,6 +4664,13 @@ func (tg *TaskGroup) Warnings(j *Job) error {
} }
} }
for _, t := range tg.Tasks {
if err := t.Warnings(); err != nil {
err = multierror.Prefix(err, fmt.Sprintf("Task %q:", t.Name))
mErr.Errors = append(mErr.Errors, err)
}
}
return mErr.ErrorOrNil() return mErr.ErrorOrNil()
} }
...@@ -5506,6 +5514,17 @@ func validateServices(t *Task) error { ...@@ -5506,6 +5514,17 @@ func validateServices(t *Task) error {
return mErr.ErrorOrNil() return mErr.ErrorOrNil()
} }
func (t *Task) Warnings() error {
var mErr multierror.Error
// Validate the resources
if t.Resources != nil && t.Resources.IOPS != 0 {
mErr.Errors = append(mErr.Errors, fmt.Errorf("IOPS has been deprecated as of Nomad 0.9.0. Please remove IOPS from resource stanza."))
}
return mErr.ErrorOrNil()
}
const ( const (
// TemplateChangeModeNoop marks that no action should be taken if the // TemplateChangeModeNoop marks that no action should be taken if the
// template is re-rendered // template is re-rendered
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment