CASSANDRA-16939: Only remove shutdown hook for fatal heap OOMs#4691
Open
Shanzita wants to merge 2 commits intoapache:trunkfrom
Open
CASSANDRA-16939: Only remove shutdown hook for fatal heap OOMs#4691Shanzita wants to merge 2 commits intoapache:trunkfrom
Shanzita wants to merge 2 commits intoapache:trunkfrom
Conversation
smiklosovic
reviewed
Mar 25, 2026
test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java
Outdated
Show resolved
Hide resolved
smiklosovic
reviewed
Mar 25, 2026
for fatal heap OOMs
84be9a8 to
e79db48
Compare
smiklosovic
reviewed
Mar 26, 2026
FORCE_HEAP_OOM_IGNORE_SET package-protected with @VisibleForTesting
smiklosovic
approved these changes
Mar 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description:
CASSANDRA-16939: Only remove shutdown hook for fatal heap
OOMs
Previously,
StorageService.removeShutdownHook()wascalled unconditionally
for all
OutOfMemoryErrors inJVMStabilityInspector.inspectThrowable().This removed the drain shutdown hook even for non-fatal
OOMs like
"Direct buffer memory" or "unable to create new native
thread", preventing
graceful shutdown afterward even though the JVM was
otherwise healthy.
The fix guards
removeShutdownHook()with a newisHeapSpaceOom()methodthat reuses the existing
FORCE_HEAP_OOM_IGNORE_SETtoonly remove the hook
for fatal heap OOMs ("Java heap space", "GC Overhead limit
exceeded").
Changes:
JVMStabilityInspector.java: GuardremoveShutdownHook()withisHeapSpaceOom()checkJVMStabilityInspectorTest.java: Added tests verifyingshutdown hook is preserved
for non-fatal OOMs and removed for fatal OOMs
Tests:
patch by Shanizta Siddiqua; reviewed by for
CASSANDRA-16939