Merge da943add35 into 10557d7ffe

Merge branch 'apache:trunk' into liuisaac/CASSANDRA-19831/trunk
2026-08-01 15:48:43 +00:00 · 2026-08-01 11:48:39 -04:00 · 2026-07-10 22:37:14 -04:00 · 2026-07-06 23:38:07 -04:00 · 2026-07-06 23:31:00 -04:00 · 2026-07-03 21:27:02 -04:00
1 changed files with 1 additions and 1 deletions
--- 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("Non-heap OutOfMemoryError detected, forcing a heap OutOfMemoryError to trigger standard JVM OOM handling:", oom);
        // Start to produce heap space OOM forcibly.
        List<long[]> ignored = new ArrayList<>();
        while (true)
Author	SHA1	Message	Date
Isaac Liu	6d27ee1b25	Merge `da943add35` into `10557d7ffe`	2026-08-01 15:48:43 +00:00
Isaac Liu	da943add35	Merge branch 'apache:trunk' into liuisaac/CASSANDRA-19831/trunk	2026-08-01 11:48:39 -04:00
Isaac Liu	21b428ab72	Merge branch 'apache:trunk' into liuisaac/CASSANDRA-19831/trunk	2026-07-10 22:37:14 -04:00
liuisaac	7a5e3d3cc9	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	2026-07-06 23:38:07 -04:00
liuisaac	1ca922b108	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	2026-07-06 23:31:00 -04:00
liuisaac	8f49d37775	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	2026-07-03 21:27:02 -04:00