From 8f49d377755bb9a259546dbccbae74d3f6f85f5a Mon Sep 17 00:00:00 2001 From: liuisaac <80558145+liuisaac@users.noreply.github.com> Date: Fri, 3 Jul 2026 21:27:02 -0400 Subject: [PATCH 1/3] CASSANDRA-19831: Clarify off-heap OOM error msg Update the log string in JVMStabilityInspector to prevent operators from mistakenly increasing heap size when an off-heap OOM occurs. Patch by Isaac Liu; reviewed by TBD for CASSANDRA-19831 --- src/java/org/apache/cassandra/utils/JVMStabilityInspector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java b/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java index b11dafbc72..7322f44a9f 100644 --- a/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java +++ b/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java @@ -200,7 +200,7 @@ public final class JVMStabilityInspector { if (FORCE_HEAP_OOM_IGNORE_SET.contains(oom.getMessage())) return; - logger.error("Force heap space OutOfMemoryError in the presence of", oom); + logger.error("Off-heap OOM forcing heap space OutOfMemoryError after OutOfMemoryError:", oom); // Start to produce heap space OOM forcibly. List ignored = new ArrayList<>(); while (true) From 1ca922b108b88a91a43c42c2bc9c85babc77fc0c Mon Sep 17 00:00:00 2001 From: liuisaac <80558145+liuisaac@users.noreply.github.com> Date: Mon, 6 Jul 2026 23:31:00 -0400 Subject: [PATCH 2/3] CASSANDRA-19831: Clarify off-heap OOM error msg Updated wording for the log to be less redundant and even more straightforward for operators to understand Patch by Isaac Liu; reviewed by TBD for CASSANDRA-19831 --- src/java/org/apache/cassandra/utils/JVMStabilityInspector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java b/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java index 7322f44a9f..95f3f3da35 100644 --- a/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java +++ b/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java @@ -200,7 +200,7 @@ public final class JVMStabilityInspector { if (FORCE_HEAP_OOM_IGNORE_SET.contains(oom.getMessage())) return; - logger.error("Off-heap OOM forcing heap space OutOfMemoryError after OutOfMemoryError:", oom); + logger.error("Off-heap OutOfMemoryError detected, forcing a heap OutOfMemoryError to trigger standard JVM OOM handling:", oom); // Start to produce heap space OOM forcibly. List ignored = new ArrayList<>(); while (true) From 7a5e3d3cc9b60e09228cdea2c7d382967e8d7b42 Mon Sep 17 00:00:00 2001 From: liuisaac <80558145+liuisaac@users.noreply.github.com> Date: Mon, 6 Jul 2026 23:38:07 -0400 Subject: [PATCH 3/3] CASSANDRA-19831: Off-heap -> Non-heap Changed wording of "Off-heap" to "Non-heap" to be more generic and match the contract defined in the comments of the method Patch by Isaac Liu; reviewed by TBD for CASSANDRA-19831 --- src/java/org/apache/cassandra/utils/JVMStabilityInspector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java b/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java index 95f3f3da35..96bc6f7cbb 100644 --- a/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java +++ b/src/java/org/apache/cassandra/utils/JVMStabilityInspector.java @@ -200,7 +200,7 @@ public final class JVMStabilityInspector { if (FORCE_HEAP_OOM_IGNORE_SET.contains(oom.getMessage())) return; - logger.error("Off-heap OutOfMemoryError detected, forcing a heap OutOfMemoryError to trigger standard JVM OOM handling:", oom); + logger.error("Non-heap OutOfMemoryError detected, forcing a heap OutOfMemoryError to trigger standard JVM OOM handling:", oom); // Start to produce heap space OOM forcibly. List ignored = new ArrayList<>(); while (true)