Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

memory default is 10, not 300 #3520

Merged
merged 5 commits into from
Nov 10, 2017
Merged

memory default is 10, not 300 #3520

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
264d999
`memory` default is 10, not 300
angrycub Nov 7, 2017
7c98e46
Rolled back documentation change in favor of correcting the default
angrycub Nov 7, 2017
1cb5286
Canonicalize task and remove merge with MinResources
angrycub Nov 9, 2017
20ea6b2
Adopted pattern from LogConfig to handle panic when no resource stanz…
angrycub Nov 9, 2017
892f348
Simplified based on review comments
angrycub Nov 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 7 additions & 4 deletions api/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,13 @@ 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 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, this makes MinResources unused, but I think that's ok. Users of the api package still may find it useful. The old code was pretty weird anyway since MinResources and Canonicalize set the same fields so calling MinResources was already worthless.

You could simplify this to:

if t.Resources == nil {
  t.Resources = &Resources{}
}
t.Resources.Canonicalize()

var r Resources
r.Canonicalize()
t.Resources = &r
} else {
t.Resources.Canonicalize()
}

if t.KillTimeout == nil {
t.KillTimeout = helper.TimeToPtr(5 * time.Second)
Expand Down