mirror of
https://github.com/kemko/nomad.git
synced 2026-01-07 10:55:42 +03:00
Warn if IOPS is being used
This commit is contained in:
@@ -853,6 +853,7 @@ func ApiResourcesToStructs(in *api.Resources) *structs.Resources {
|
||||
out := &structs.Resources{
|
||||
CPU: *in.CPU,
|
||||
MemoryMB: *in.MemoryMB,
|
||||
IOPS: *in.IOPS, // COMPAT(0.10): Only being used to issue warnings
|
||||
}
|
||||
|
||||
if l := len(in.Networks); l != 0 {
|
||||
|
||||
@@ -1698,6 +1698,7 @@ type Resources struct {
|
||||
CPU int
|
||||
MemoryMB int
|
||||
DiskMB int
|
||||
IOPS int // COMPAT(0.10): Only being used to issue warnings
|
||||
Networks Networks
|
||||
Devices []*RequestedDevice
|
||||
}
|
||||
@@ -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()
|
||||
}
|
||||
|
||||
@@ -5506,6 +5514,17 @@ func validateServices(t *Task) error {
|
||||
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 (
|
||||
// TemplateChangeModeNoop marks that no action should be taken if the
|
||||
// template is re-rendered
|
||||
|
||||
Reference in New Issue
Block a user