GEODE-5819: Reduce 16h40m wait on shutdown to 120 seconds. (apache#2736)

* While this is unlikely to correct the Java11 SSL handshake failures, it should make tests currently hanging properly fail out so that a full failure-set can be analyzed.
b-xiang · Oct 26, 2018 · 4e83d67 · 4e83d67
1 parent 5680658
commit 4e83d67
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalLocator.java
@@ -797,7 +797,9 @@ public void stop(boolean forcedDisconnect, boolean stopForReconnect, boolean wai
       }
       boolean interrupted = Thread.interrupted();
       try {
-        this.server.join(TcpServer.SHUTDOWN_WAIT_TIME * 1000 + 10000);
+        // TcpServer up to SHUTDOWN_WAIT_TIME for its executor pool to shut down.
+        // We wait 2 * SHUTDOWN_WAIT_TIME here to account for that shutdown, and then our own.
+        this.server.join(TcpServer.SHUTDOWN_WAIT_TIME * 2);
 
       } catch (InterruptedException ex) {
         interrupted = true;