Fix undefined value issue.

morganstanley · Apr 9, 2024 · 4f6af21 · 4f6af21
1 parent 7326c11
commit 4f6af21
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/testplan/monitor/resource.py b/testplan/monitor/resource.py
@@ -25,6 +25,10 @@
 
 @dataclasses.dataclass
 class ResourceData:
+    """
+    Attributes of collecting resource data
+    """
+
     cpu_usage: float
     memory_used: int
     iops: float
@@ -34,17 +38,29 @@ class ResourceData:
 
 @dataclasses.dataclass
 class HostResourceData(ResourceData):
+    """
+    Host level resource data
+    """
+
     disk_used: int
 
 
 @dataclasses.dataclass
 class ProcessResourceData(ResourceData):
+    """
+    Process level resource data
+    """
+
     name: str
     cmdline: str
     pid: int
 
 
 class HostResourceRow(NamedTuple):
+    """
+    CSV file row structure of host level resource
+    """
+
     timestamp: float
     cpu_usage: float
     memory_used: int
@@ -55,6 +71,10 @@ class HostResourceRow(NamedTuple):
 
 
 class ProcessResourceRow(NamedTuple):
+    """
+    CSV file row structure of process level resource
+    """
+
     timestamp: float
     pid: int
     name: str
@@ -137,7 +157,7 @@ def collect_memory_usage(self) -> int:
     @staticmethod
     def _ensure_positive(num):
         # Fix IO counter issue
-        return 0 if num < 0 else num
+        return max(num, 0)
 
     def collect_host_data(self):
         _disk_io = psutil.disk_io_counters()

diff --git a/testplan/web_ui/testing/src/AssertionPane/ResourcePanel.js b/testplan/web_ui/testing/src/AssertionPane/ResourcePanel.js
@@ -427,7 +427,7 @@ const TopUsageBanner = ({
     fontWeight: "500",
     cursor: "pointer",
   };
-  const cpuDiv = _.isEmpty(maxCPU, true) ? null : (
+  const cpuDiv = _.isEmpty(maxCPU?.value, true) ? null : (
     <div
       style={itemStyle}
       title={maxCPU.uid}
@@ -437,7 +437,7 @@ const TopUsageBanner = ({
     </div>
   );
 
-  const memDiv = _.isEmpty(maxMemory, true) ? null : (
+  const memDiv = _.isEmpty(maxMemory?.value, true) ? null : (
     <div
       style={itemStyle}
       title={maxMemory.uid}
@@ -447,7 +447,7 @@ const TopUsageBanner = ({
     </div>
   );
 
-  const diskDiv = _.isEmpty(maxDisk, true) ? null : (
+  const diskDiv = _.isEmpty(maxDisk?.value, true) ? null : (
     <div
       style={itemStyle}
       title={maxDisk.uid}
@@ -457,7 +457,7 @@ const TopUsageBanner = ({
     </div>
   );
 
-  const iopsDiv = _.isEmpty(maxIOPS, true) ? null : (
+  const iopsDiv = _.isEmpty(maxIOPS?.value, true) ? null : (
     <div
       style={itemStyle}
       title={maxIOPS.uid}