Skip to content
This repository was archived by the owner on Sep 2, 2022. It is now read-only.

Commit 2f94764

Browse files
author
sharkdtu
committed
Fix memory divisor in calHeapSize
1 parent 0310df7 commit 2f94764

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

controllers/flinkcluster_converter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ func calHeapSize(memSize int64, offHeapMin int64, offHeapRatio int64) int64 {
944944
}
945945
heapSizeCalculated := memSize - offHeapSize
946946
if heapSizeCalculated > 0 {
947-
divisor := resource.MustParse("1M")
947+
divisor := resource.MustParse("1Mi")
948948
heapSizeQuantity := resource.NewQuantity(heapSizeCalculated, resource.DecimalSI)
949949
heapSizeMB = convertResourceMemoryToInt64(*heapSizeQuantity, divisor)
950950
}

controllers/flinkcluster_converter_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ jobmanager.rpc.address: flinkjobcluster-sample-jobmanager
900900
jobmanager.rpc.port: 6123
901901
query.server.port: 6125
902902
rest.port: 8081
903-
taskmanager.heap.size: 474m
903+
taskmanager.heap.size: 452m
904904
taskmanager.numberOfTaskSlots: 1
905905
taskmanager.rpc.port: 6122
906906
`
@@ -1068,8 +1068,8 @@ func TestCalFlinkHeapSize(t *testing.T) {
10681068

10691069
flinkHeapSize := calFlinkHeapSize(cluster)
10701070
expectedFlinkHeapSize := map[string]string{
1071-
"jobmanager.heap.size": "474m", // get values calculated with limit - memoryOffHeapMin
1072-
"taskmanager.heap.size": "3222m", // get values calculated with limit - limit * memoryOffHeapRatio / 100
1071+
"jobmanager.heap.size": "452m", // get values calculated with limit - memoryOffHeapMin
1072+
"taskmanager.heap.size": "3072m", // get values calculated with limit - limit * memoryOffHeapRatio / 100
10731073
}
10741074
assert.Assert(t, len(flinkHeapSize) == 2)
10751075
assert.DeepEqual(

0 commit comments

Comments
 (0)