natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Heap dump should not be generated on handled exceptions 

Patch by Paulo Motta; Reviewed by Isaac Reath, Stefan Miklosovic for CASSANDRA-20974
This commit is contained in:
Paulo Motta 2025-10-10 14:56:30 -04:00 committed by Stefan Miklosovic
parent a36b1f15e2
commit c3b2303810
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
3 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -1,6 +1,7 @@
5.0.7
* Heap dump should not be generated on handled exceptions (CASSANDRA-20974)
Merged from 4.1:
* ReadCommandController should close fast to avoid deadlock when building secondary index (CASSANDRA-19564)
* ReadCommandController should close fast to avoid deadlock when building secondary index (CASSANDRA-19564)
Merged from 4.0:
* Updated dtest-api to 0.0.18 and removed JMX-related classes that now live in the dtest-api (CASSANDRA-20884)

4
src/java/org/apache/cassandra/utils/HeapUtils.java
View File

@ -128,10 +128,6 @@ public final class HeapUtils
return fullPath;
}
else
{
logger.debug("Heap dump creation on uncaught exceptions is disabled.");
}
}
catch (Throwable e)
{

23
src/java/org/apache/cassandra/utils/JVMStabilityInspector.java
View File

@ -75,7 +75,7 @@ public final class JVMStabilityInspector
if (t2 != t && (t2 instanceof FSError || t2 instanceof CorruptSSTableException))
logger.error("Exception in thread {}", thread, t2);
}
JVMStabilityInspector.inspectThrowable(t);
inspectThrowable(t, JVMStabilityInspector::inspectDiskError, true);
}
/**
@ -86,12 +86,12 @@ public final class JVMStabilityInspector
*/
public static void inspectThrowable(Throwable t) throws OutOfMemoryError
{
inspectThrowable(t, JVMStabilityInspector::inspectDiskError);
inspectThrowable(t, JVMStabilityInspector::inspectDiskError, false);
}
public static void inspectCommitLogThrowable(Throwable t)
{
inspectThrowable(t, JVMStabilityInspector::inspectCommitLogError);
inspectThrowable(t, JVMStabilityInspector::inspectCommitLogError, false);
}
private static void inspectDiskError(Throwable t)
@ -102,7 +102,7 @@ public final class JVMStabilityInspector
FileUtils.handleFSError((FSError) t);
}
public static void inspectThrowable(Throwable t, Consumer<Throwable> fn) throws OutOfMemoryError
public static void inspectThrowable(Throwable t, Consumer<Throwable> fn, boolean isUncaughtException) throws OutOfMemoryError
{
boolean isUnstable = false;
if (t instanceof OutOfMemoryError)
@ -136,7 +136,18 @@ public final class JVMStabilityInspector
}
// Anything other than an OOM, we should try and heap dump to capture what's going on if configured to do so
HeapUtils.maybeCreateHeapDump();
if (isUncaughtException && DatabaseDescriptor.getDumpHeapOnUncaughtException())
{
try
{
// Avoid entering maybeCreateHeapDump unless the setting is enabled to avoid expensive lock
HeapUtils.maybeCreateHeapDump();
}
catch (Throwable sub)
{
t.addSuppressed(sub);
}
}
if (t instanceof InterruptedException)
throw new UncheckedInterruptedException((InterruptedException) t);
@ -167,7 +178,7 @@ public final class JVMStabilityInspector
}
if (t.getCause() != null)
inspectThrowable(t.getCause(), fn);
inspectThrowable(t.getCause(), fn, isUncaughtException);
}
private static final Set<String> FORCE_HEAP_OOM_IGNORE_SET = ImmutableSet.of("Java heap space", "GC Overhead limit exceeded");