Merge pull request #18873 from mckellyln/swapfree_fix

HPCC-32234 SYS: swap and mem util stats sometimes invalid on containers Reviewed-by: Gavin Halliday <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Jul 16, 2024 · c5e22ef · c5e22ef
2 parents 58924f3 + 3225279
commit c5e22ef
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/system/jlib/jdebug.cpp b/system/jlib/jdebug.cpp
@@ -1453,7 +1453,13 @@ static void getMemUsage(unsigned &inuse,unsigned &active,unsigned &total,unsigne
         bufptr = strchr(bufptr, '\n');
     }
     inuse = total-free-cached;
-    swapinuse = swaptotal-swapfree-swapcached;
+
+    // not sure if a bug in kernel or container or ...
+    // but sometimes we see swapfree > 0 when swaptotal == 0
+    if ((swapfree + swapcached) >= swaptotal)
+        swapinuse = 0;
+    else
+        swapinuse = swaptotal-swapfree-swapcached;
 #endif
 }