Skip to content

fixed vcpus-to-memory ratio calc to use ceiling #18

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

Merged
merged 2 commits into from
Jun 23, 2020
Merged

fixed vcpus-to-memory ratio calc to use ceiling #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e9bf55
fixed vcpus-to-memory ratio calc to use ceiling
bwagner5 Jun 23, 2020
93e0854
fix ratio calc when vcpus is 0
bwagner5 Jun 23, 2020
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
5 changes: 3 additions & 2 deletions pkg/selector/comparators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,12 @@ func supportSyntaxToBool(instanceTypeSupport *string) *bool {
}

func calculateVCpusToMemoryRatio(vcpusVal *int64, memoryVal *int64) *float64 {
if vcpusVal == nil || memoryVal == nil {
if vcpusVal == nil || *vcpusVal == 0 || memoryVal == nil {
return nil
}
// normalize vcpus to a mebivcpu value
return aws.Float64(float64(*memoryVal) / float64(*vcpusVal*1024))
result := math.Ceil(float64(*memoryVal) / float64(*vcpusVal*1024))
return &result
}

// Slice helper function
Expand Down
11 changes: 8 additions & 3 deletions pkg/selector/comparators_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,17 +217,22 @@ func TestCalculateVCpusToMemoryRatio(t *testing.T) {
vcpus := aws.Int64(4)
memory := aws.Int64(4096)
ratio := calculateVCpusToMemoryRatio(vcpus, memory)
h.Assert(t, *ratio == 1.00, "nil should evaluate to nil")
h.Assert(t, *ratio == 1.00, "ratio should equal 1:1")

vcpus = aws.Int64(2)
memory = aws.Int64(4096)
ratio = calculateVCpusToMemoryRatio(vcpus, memory)
h.Assert(t, *ratio == 2.00, "nil should evaluate to nil")
h.Assert(t, *ratio == 2.00, "ratio should equal 1:2")

vcpus = aws.Int64(1)
memory = aws.Int64(512)
ratio = calculateVCpusToMemoryRatio(vcpus, memory)
h.Assert(t, *ratio == 0.50, "nil should evaluate to nil")
h.Assert(t, *ratio == 1.0, "ratio should take the ceiling which equals 1:1")

vcpus = aws.Int64(0)
memory = aws.Int64(512)
ratio = calculateVCpusToMemoryRatio(vcpus, memory)
h.Assert(t, ratio == nil, "ratio should be nil when vcpus is 0")
}

func TestCalculateVCpusToMemoryRatio_Nil(t *testing.T) {
Expand Down