From cd6bd7ab5b2a20b200ca5212ab66c38f00d228f5 Mon Sep 17 00:00:00 2001
From: Scott Moore <scott.moore@viavisolutions.com>
Date: Thu, 7 Nov 2024 22:05:21 +0000
Subject: [PATCH] STORM-4104 Fix Pacemaker server stability issues

---
 .../src/jvm/org/apache/storm/utils/Utils.java |  8 ++--
 .../jvm/org/apache/storm/utils/UtilsTest.java | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
index 6a07007e23c..e8b275a739c 100644
--- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java
@@ -652,9 +652,11 @@ public static void handleUncaughtException(Throwable t, Set<Class<?>> allowedExc
             }
         }
 
-        if (allowedExceptions.contains(t.getClass())) {
-            LOG.info("Swallowing {} {}", t.getClass(), t);
-            return;
+        for (Class<?> classType : allowedExceptions) {
+            if (Utils.exceptionCauseIsInstanceOf(classType, t)) {
+                LOG.info("Swallowing {} {}", t.getClass(), t);
+                return;
+            }
         }
 
         if (worker && isAllowedWorkerException(t)) {
diff --git a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
index b0b331011d2..c07a054238d 100644
--- a/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
+++ b/storm-client/test/jvm/org/apache/storm/utils/UtilsTest.java
@@ -18,13 +18,17 @@
 
 package org.apache.storm.utils;
 
+import java.io.IOException;
+import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.NavigableMap;
+import java.util.Set;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 
@@ -42,6 +46,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.storm.utils.Utils.handleUncaughtException;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class UtilsTest {
@@ -473,4 +478,43 @@ public List<CycleDetectionScenario> createTestScenarios() {
             fail(String.join("\n", testFailures));
         }
     }
+
+    @Test
+    public void testHandleUncaughtExceptionSwallowsCausedAndDerivedExceptions() {
+        Set<Class<?>> allowedExceptions = new HashSet<>(Arrays.asList(new Class<?>[]{ IOException.class }));
+        try {
+            handleUncaughtException(new IOException(), allowedExceptions, false);
+        } catch(Throwable unexpected) {
+            fail("Should have swallowed IOException!", unexpected);
+        }
+
+        try {
+            handleUncaughtException(new SocketException(), allowedExceptions, false);
+        } catch(Throwable unexpected) {
+            fail("Should have swallowed Throwable derived from IOException!", unexpected);
+        }
+
+        try {
+            handleUncaughtException(new TTransportException(new IOException()), allowedExceptions, false);
+        } catch(Throwable unexpected) {
+            fail("Should have swallowed Throwable caused by an IOException!", unexpected);
+        }
+
+        try {
+            handleUncaughtException(new TTransportException(new SocketException()), allowedExceptions, false);
+        } catch(Throwable unexpected) {
+            fail("Should have swallowed Throwable caused by a Throwable derived from IOException!", unexpected);
+        }
+
+        Throwable t = new NullPointerException();
+        String expectationMessage = "Should have thrown an Error() with a cause of NullPointerException";
+        try {
+            handleUncaughtException(t, allowedExceptions, false);
+            fail(expectationMessage);
+        } catch(Error expected) {
+            assertEquals(expected.getCause(), t, expectationMessage);
+        } catch(Throwable unexpected) {
+            fail(expectationMessage, unexpected);
+        }
+    }
 }