Merge pull request #3520 from hashicorp/b-memory-default-incorrect

`memory` default is 10, not 300
hashicorp · Nov 10, 2017 · 55bf685 · 55bf685
2 parents 344d029 + 892f348
commit 55bf685
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/api/resources.go b/api/resources.go
@@ -17,7 +17,7 @@ func (r *Resources) Canonicalize() {
 		r.CPU = helper.IntToPtr(100)
 	}
 	if r.MemoryMB == nil {
-		r.MemoryMB = helper.IntToPtr(10)
+		r.MemoryMB = helper.IntToPtr(300)
 	}
 	if r.IOPS == nil {
 		r.IOPS = helper.IntToPtr(0)

diff --git a/api/tasks.go b/api/tasks.go
@@ -373,11 +373,10 @@ type Task struct {
 }
 
 func (t *Task) Canonicalize(tg *TaskGroup, job *Job) {
-	min := MinResources()
-	min.Merge(t.Resources)
-	min.Canonicalize()
-	t.Resources = min
-
+	if t.Resources == nil {
+		t.Resources = &Resources{}
+	}
+	t.Resources.Canonicalize()
 	if t.KillTimeout == nil {
 		t.KillTimeout = helper.TimeToPtr(5 * time.Second)
 	}