[UNDERTOW-1962] Sleep 1-2 seconds when stopping the server

undertow-io · Sep 27, 2021 · b6d4903 · b6d4903
1 parent 7fb00a9
commit b6d4903
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 2 deletions.
diff --git a/core/src/test/java/io/undertow/client/http/AjpClientTestCase.java b/core/src/test/java/io/undertow/client/http/AjpClientTestCase.java
@@ -119,6 +119,10 @@ public static void beforeClass() throws IOException {
     public static void afterClass() throws InterruptedException {
         undertow.stop();
         stopWorker(worker);
+        // sleep 1 s to prevent BindException (Address already in use) when running the CI
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {}
     }
 
     static UndertowClient createClient() {
@@ -218,6 +222,12 @@ public void failed(IOException e) {
                 }
 
             } finally {
+                // add an extra sleep time to make sure we are not getting a BindException
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    // ignore
+                }
                 undertow.start();
             }
 

diff --git a/core/src/test/java/io/undertow/server/StopTestCase.java b/core/src/test/java/io/undertow/server/StopTestCase.java
@@ -1,12 +1,21 @@
 package io.undertow.server;
 
+import org.junit.After;
 import org.junit.Test;
 import org.xnio.Options;
 
 import io.undertow.Undertow;
 
 public class StopTestCase {
 
+    @After
+    public void waitServerStopCompletely() {
+        // sleep 1 s to prevent BindException (Address already in use) when running the tests
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {}
+    }
+
     @Test
     public void testStopUndertowNotStarted() {
         Undertow.builder().build().stop();
@@ -18,8 +27,7 @@ public void testStopUndertowAfterExceptionDuringStart() {
         Undertow undertow = Undertow.builder().setWorkerOption(Options.WORKER_IO_THREADS, -1).build();
         try {
             undertow.start();
-        }
-        catch (RuntimeException e) {
+        } catch (RuntimeException ignore) {
         }
         undertow.stop();
     }

diff --git a/core/src/test/java/io/undertow/server/handlers/HttpTunnelingViaConnectTestCase.java b/core/src/test/java/io/undertow/server/handlers/HttpTunnelingViaConnectTestCase.java
@@ -72,6 +72,10 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
     public static void stop() {
         server.stop();
         server = null;
+        // sleep 1 s to prevent BindException (Address already in use) when running the CI
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {}
     }
 
     @Test

diff --git a/core/src/test/java/io/undertow/server/handlers/PredicatedHandlersProxyTestCase.java b/core/src/test/java/io/undertow/server/handlers/PredicatedHandlersProxyTestCase.java
@@ -100,6 +100,10 @@ public void testProxy() throws Exception {
     @AfterClass
     public static void teardown() {
         server1.stop();
+        // sleep 1 s to prevent BindException (Address already in use) when running the CI
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {}
     }
 
 }
diff --git a/core/src/test/java/io/undertow/server/handlers/URLDecodingHandlerTestCase.java b/core/src/test/java/io/undertow/server/handlers/URLDecodingHandlerTestCase.java
@@ -62,6 +62,10 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
             }
         } finally {
             undertow.stop();
+            // sleep 1 s to prevent BindException (Address already in use) when restarting the server
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignore) {}
         }
     }
 
@@ -87,6 +91,10 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
             }
         } finally {
             undertow.stop();
+            // sleep 1 s to prevent BindException (Address already in use) when restarting the server
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignore) {}
         }
     }
 
@@ -116,6 +124,10 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
             }
         } finally {
             undertow.stop();
+            // sleep 1 s to prevent BindException (Address already in use) when restarting the server
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignore) {}
         }
     }
 
@@ -141,6 +153,10 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
             }
         } finally {
             undertow.stop();
+            // sleep 1 s to prevent BindException (Address already in use) when restarting the server
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignore) {}
         }
     }
 

diff --git a/...rc/test/java/io/undertow/server/handlers/proxy/LoadBalancerConnectionPoolingTestCase.java b/...rc/test/java/io/undertow/server/handlers/proxy/LoadBalancerConnectionPoolingTestCase.java
@@ -81,6 +81,10 @@ public void closed(ServerConnection connection) {
     @AfterClass
     public static void after() {
         undertow.stop();
+        // sleep 1 s to prevent BindException (Address already in use) when running the CI
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {}
     }
 
     @Test

diff --git a/...a/io/undertow/server/handlers/proxy/LoadBalancingProxyWithCustomHostSelectorTestCase.java b/...a/io/undertow/server/handlers/proxy/LoadBalancingProxyWithCustomHostSelectorTestCase.java
@@ -71,6 +71,10 @@ public int selectHost(LoadBalancingProxyClient.Host[] availableHosts) {
     public static void teardown() {
         server1.stop();
         server2.stop();
+        // sleep 1 s to prevent BindException (Address already in use) when running the CI
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {}
     }
 
     // https://issues.jboss.org/browse/UNDERTOW-289

diff --git a/core/src/test/java/io/undertow/server/handlers/proxy/ProxyHandlerXForwardedForTestCase.java b/core/src/test/java/io/undertow/server/handlers/proxy/ProxyHandlerXForwardedForTestCase.java
@@ -63,6 +63,11 @@ public static void setup() throws Exception {
     public static void teardown() throws Exception {
         DefaultServer.stopSSLServer();
         server.stop();
+        // sleep 1 s to prevent BindException (Address already in use) when running the CI
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {}
+
     }
 
     private static void setProxyHandler(boolean rewriteHostHeader, boolean reuseXForwarded) throws Exception {

diff --git a/core/src/test/java/io/undertow/server/handlers/proxy/ProxyPathHandlingTest.java b/core/src/test/java/io/undertow/server/handlers/proxy/ProxyPathHandlingTest.java
@@ -28,6 +28,12 @@ public class ProxyPathHandlingTest {
     public void cleanup() {
         targetServer.stop();
         proxyServer.stop();
+        // add a 1s sleep time to prevent BindException (Address already in use) when restarting the server
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {
+
+        }
     }
 
     @Test

diff --git a/...c/test/java/io/undertow/server/handlers/proxy/mod_cluster/AbstractModClusterTestBase.java b/...c/test/java/io/undertow/server/handlers/proxy/mod_cluster/AbstractModClusterTestBase.java
@@ -197,6 +197,10 @@ static void stopServers() {
                 }
             }
             servers = null;
+            // sleep 2 s to prevent BindException (Address already in use) when running the CI
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException ignore) {}
         }
     }
 

diff --git a/core/src/test/java/io/undertow/server/protocol/ajp/AjpCharacterEncodingTestCase.java b/core/src/test/java/io/undertow/server/protocol/ajp/AjpCharacterEncodingTestCase.java
@@ -78,6 +78,10 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
     public static void after() {
         DefaultServer.setUndertowOptions(old);
         undertow.stop();
+        // sleep 1 s to prevent BindException (Address already in use) when running the CI
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {}
 
     }
 

diff --git a/core/src/test/java/io/undertow/server/protocol/http2/HTTP2ViaUpgradeTestCase.java b/core/src/test/java/io/undertow/server/protocol/http2/HTTP2ViaUpgradeTestCase.java
@@ -126,6 +126,10 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
     @AfterClass
     public static void stop() {
         server.stop();
+        // sleep 1 s to prevent BindException (Address already in use) when running the CI
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException ignore) {}
     }
 
     @Test

diff --git a/core/src/test/java/io/undertow/server/protocol/http2/Http2EndExchangeTestCase.java b/core/src/test/java/io/undertow/server/protocol/http2/Http2EndExchangeTestCase.java
@@ -181,6 +181,10 @@ public void failed(IOException e) {
         } finally {
             stopWorker(xnioWorker);
             server.stop();
+            // sleep 1 s to prevent BindException (Address already in use) when running the CI
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignore) {}
         }
     }
 

diff --git a/core/src/test/java/io/undertow/server/protocol/proxy/ProxyProtocolTestCase.java b/core/src/test/java/io/undertow/server/protocol/proxy/ProxyProtocolTestCase.java
@@ -302,6 +302,10 @@ private void proxyProtocolRequestResponseCheck(String request, String expectedRe
             Assert.assertTrue(result, result.contains(expectedResponse));
         } finally {
             undertow.stop();
+            // sleep 1 s to prevent BindException (Address already in use) when running the tests
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignore) {}
         }
     }
 
@@ -539,6 +543,10 @@ private void proxyProtocolRequestResponseCheck(byte[] request, String requestHtt
             Assert.assertTrue(result, result.contains(expectedResponse));
         } finally {
             undertow.stop();
+            // sleep 1 s to prevent BindException (Address already in use) when restarting the server
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignore) {}
         }
     }
 
@@ -579,6 +587,10 @@ public void doTestProxyProtocolUnknown(String extra) throws Exception {
             Assert.assertTrue(result, result.contains(expected));
         } finally {
             undertow.stop();
+            // sleep 1 s to prevent BindException (Address already in use) when restarting the server
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignore) {}
         }
     }
 

diff --git a/core/src/test/java/io/undertow/server/ssl/DelegatedTaskExecutorTestCase.java b/core/src/test/java/io/undertow/server/ssl/DelegatedTaskExecutorTestCase.java
@@ -115,6 +115,10 @@ public void testRejection() {
         } finally {
             undertow.stop();
             client.getConnectionManager().shutdown();
+            // sleep 1 s to prevent BindException (Address already in use) when running the CI
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ignore) {}
         }
     }
 

diff --git a/core/src/test/java/io/undertow/server/ssl/TLS13HalfCloseHangTestCase.java b/core/src/test/java/io/undertow/server/ssl/TLS13HalfCloseHangTestCase.java
@@ -56,6 +56,10 @@ public void testHang() throws IOException, GeneralSecurityException, Interrupted
     doRequest(clientSslContext, address);
 
     server.stop();
+    // sleep 1 s to prevent BindException (Address already in use) when running the CI
+    try {
+      Thread.sleep(1000);
+    } catch (InterruptedException ignore) {}
   }
 
   private void doRequest(SSLContext clientSslContext, InetSocketAddress address)