rubik/patch/0009-rubik-optimize-dynamicAdjust-to-be-clear-and-add-log.patch

From 3d63470cb0638f9b426f2060c260c45f27c36f04 Mon Sep 17 00:00:00 2001
From: hanchao <hanchao63@huawei.com>
Date: Mon, 19 Jun 2023 20:29:41 +0800
Subject: [PATCH 09/13] rubik: optimize `dynamicAdjust` to be clear and add log
 for error

---
 pkg/services/dynmemory/fssr.go | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkg/services/dynmemory/fssr.go b/pkg/services/dynmemory/fssr.go
index e23a4bc..2c81ccf 100644
--- a/pkg/services/dynmemory/fssr.go
+++ b/pkg/services/dynmemory/fssr.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
+	"math"
 	"os"
 	"strconv"
 
@@ -76,26 +77,35 @@ func (f *fssrDynMemAdapter) dynamicAdjust() {
 			f.count++
 			return
 		}
-		// no risk of overflow
+		// check int64 overflow
+		if f.memHigh > math.MaxInt64-f.memTotal/100 {
+			log.Errorf("int64 overflow")
+			return
+		}
 		memHigh = f.memHigh + f.memTotal/100
 		if memHigh > f.memTotal*8/10 {
 			memHigh = f.memTotal * 8 / 10
 		}
+		f.adjustMemoryHigh(memHigh)
 	} else if freeMem < f.reservedMem {
 		memHigh = f.memHigh - f.memTotal/10
-		if memHigh < 0 {
+		if memHigh <= 0 {
+			log.Errorf("memHigh is equal to or less than 0")
 			return
 		}
 		if memHigh < f.memTotal*3/10 {
 			memHigh = f.memTotal * 3 / 10
 		}
+		f.adjustMemoryHigh(memHigh)
 	}
+	f.count = 0
+}
+
+func (f *fssrDynMemAdapter) adjustMemoryHigh(memHigh int64) {
 	if memHigh != f.memHigh {
 		f.memHigh = memHigh
 		f.adjustOfflinePodHighMemory()
 	}
-
-	f.count = 0
 }
 
 // adjustOfflinePodHighMemory adjusts the memory.high of offline pods.
-- 
2.41.0