From ff59acd02fe6f601a929963d3c5bfefa61e21387 Mon Sep 17 00:00:00 2001
From: Wenjun Ruan <wenjun@apache.org>
Date: Wed, 2 Nov 2022 21:15:03 +0800
Subject: [PATCH] Splite cpu/memory info in OSUtils#isOverload (#12663)

---
 .../apache/dolphinscheduler/common/utils/OSUtils.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
index 2ad403014b..59f9adbdec 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
@@ -477,10 +477,14 @@ public class OSUtils {
         double loadAverage = loadAverage();
         // system available physical memory
         double availablePhysicalMemorySize = availablePhysicalMemorySize();
-        if (loadAverage > maxCpuLoadAvg || availablePhysicalMemorySize < reservedMemory) {
+        if (loadAverage > maxCpuLoadAvg) {
+            logger.warn("Current cpu load average {} is too high, max.cpuLoad.avg={}", loadAverage, maxCpuLoadAvg);
+            return true;
+        }
+
+        if (availablePhysicalMemorySize < reservedMemory) {
             logger.warn(
-                    "Current cpu load average {} is too high or available memory {}G is too low, under max.cpuLoad.avg={} and reserved.memory={}G",
-                    loadAverage, availablePhysicalMemorySize, maxCpuLoadAvg, reservedMemory);
+                    "Current available memory {}G is too low, reserved.memory={}G", maxCpuLoadAvg, reservedMemory);
             return true;
         }
         return false;