HDFS-17828. SocketTimeoutException not recognized in TestWebHdfsTimeouts with Java 24

Author: stoty

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java

@@ -318,6 +318,17 @@ public static void assertExceptionContains(String expectedText, Throwable t) {
     assertExceptionContains(expectedText, t, "");
   }
 
+  /**
+   * Assert that an exception's <code>toString()</code> value
+   * matches the regex pattern.
+   * @param pattern regex pattern to match
+   * @param t thrown exception
+   * @throws AssertionError if the pattern does not match
+   */
+  public static void assertExceptionMatches(Pattern pattern, Throwable t) {
+    assertExceptionMatches(pattern, t, "");
+  }
+
   /**
    * Assert that an exception's <code>toString()</code> value
    * contained the expected text.
@@ -345,6 +356,33 @@ public static void assertExceptionContains(String expectedText,
     }
   }
 
+  /**
+   * Assert that an exception's <code>toString()</code> value
+   * matches the pattern.
+   * @param pattern regex pattern to match
+   * @param t thrown exception
+   * @param message any extra text for the string
+   * @throws AssertionError if the expected string is not found
+   */
+  public static void assertExceptionMatches(Pattern pattern,
+      Throwable t,
+      String message) {
+    assertNotNull(t, E_NULL_THROWABLE);
+    String msg = t.toString();
+    if (msg == null) {
+      throw new AssertionError(E_NULL_THROWABLE_STRING, t);
+    }
+    if (pattern != null && !pattern.matcher(msg).matches()) {
+      String prefix = org.apache.commons.lang3.StringUtils.isEmpty(message)
+          ? "" : (message + ": ");
+      throw new AssertionError(
+          String.format("%s Expected to match '%s' %s: %s",
+              prefix, pattern, E_UNEXPECTED_EXCEPTION,
+              StringUtils.stringifyException(t)),
+          t);
+    }
+  }
+
   /**
    * Wait for the specified test to return true. The test will be performed
    * initially and then every {@code checkEveryMillis} until at least

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTimeouts.java

@@ -37,12 +37,14 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
+import java.util.regex.Pattern;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
@@ -152,8 +154,8 @@ public void testConnectTimeout(TimeoutSource src) throws Exception {
       fs.listFiles(new Path("/"), false);
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      GenericTestUtils.assertExceptionContains(fs.getUri().getAuthority()
-          + ": connect timed out",e);
+      GenericTestUtils.assertExceptionMatches(Pattern.compile(
+          ".*" + Pattern.quote(fs.getUri().getAuthority()) + ": [Cc]onnect timed out"), e);
     }
   }
 
@@ -190,8 +192,8 @@ public void testAuthUrlConnectTimeout(TimeoutSource src) throws Exception {
       fs.getDelegationToken("renewer");
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
-      GenericTestUtils.assertExceptionContains(fs.getUri().getAuthority() +
-          ": connect timed out", e);
+      GenericTestUtils.assertExceptionMatches(Pattern.compile(
+          ".*" + Pattern.quote(fs.getUri().getAuthority()) + ": [Cc]onnect timed out"), e);
     }
   }
 
@@ -230,8 +232,8 @@ public void testRedirectConnectTimeout(TimeoutSource src) throws Exception {
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
       assumeBacklogConsumed();
-      GenericTestUtils.assertExceptionContains(
-          fs.getUri().getAuthority() + ": connect timed out", e);
+      GenericTestUtils.assertExceptionMatches(Pattern.compile(
+          ".*" + Pattern.quote(fs.getUri().getAuthority()) + ": [Cc]onnect timed out"), e);
     }
   }
 
@@ -272,8 +274,8 @@ public void testTwoStepWriteConnectTimeout(TimeoutSource src) throws Exception {
       fail("expected timeout");
     } catch (SocketTimeoutException e) {
       assumeBacklogConsumed();
-      GenericTestUtils.assertExceptionContains(
-          fs.getUri().getAuthority() + ": connect timed out", e);
+      GenericTestUtils.assertExceptionMatches(Pattern.compile(
+          ".*" + Pattern.quote(fs.getUri().getAuthority()) + ": [Cc]onnect timed out"), e);
     } finally {
       IOUtils.cleanupWithLogger(LOG, os);
     }