fix(networking-timeout): graceful shutdown after failed connection (#…

…4266)
MovingBlocks · Nov 30, 2020 · 1f7ea2a · 1f7ea2a
1 parent 99feea2
commit 1f7ea2a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/engine/src/main/java/org/terasology/network/internal/ClientConnectionHandler.java b/engine/src/main/java/org/terasology/network/internal/ClientConnectionHandler.java
@@ -44,7 +44,7 @@ public class ClientConnectionHandler extends ChannelInboundHandlerAdapter {
     private Path tempModuleLocation;
     private BufferedOutputStream downloadingModule;
     private long lengthReceived;
-    private Timer timeoutTimer = new Timer();
+    private Timer timeoutTimer = new Timer("Netty-Timeout-Timer", true);
     private long timeoutPoint = System.currentTimeMillis();
     private final long timeoutThreshold = 120000;
     private Channel channel;

diff --git a/engine/src/main/java/org/terasology/network/internal/NetworkSystemImpl.java b/engine/src/main/java/org/terasology/network/internal/NetworkSystemImpl.java
@@ -136,6 +136,7 @@ public class NetworkSystemImpl implements EntityChangeSubscriber, NetworkSystem
 
     // Client only
     private ServerImpl server;
+    private EventLoopGroup clientGroup;
 
     public NetworkSystemImpl(Time time, Context context) {
         this.time = time;
@@ -219,11 +220,11 @@ public JoinStatus join(String address, int port) throws InterruptedException {
             }
             ChannelFuture connectCheck = null;
 
-            EventLoopGroup group = new NioEventLoopGroup();
+            clientGroup = new NioEventLoopGroup();
             try {
                 Bootstrap clientBootstrap = new Bootstrap();
 
-                clientBootstrap.group(group);
+                clientBootstrap.group(clientGroup);
                 clientBootstrap.channel(NioSocketChannel.class);
                 clientBootstrap.option(ChannelOption.SO_KEEPALIVE, true);
                 clientBootstrap.option(ChannelOption.TCP_NODELAY, true);
@@ -247,13 +248,17 @@ public JoinStatus join(String address, int port) throws InterruptedException {
                     } else {
                         logger.warn("Failed to connect to server", connectCheck.cause());
                         connectCheck.channel().closeFuture().awaitUninterruptibly();
+                        clientGroup.shutdownGracefully().syncUninterruptibly();
                         return new JoinStatusImpl("Failed to connect to server - " + connectCheck.cause().getMessage());
                     }
                 }
                 connectCheck.channel().closeFuture().sync();
-            } catch (InterruptedException e) {
-                connectCheck.cancel(true);
-                connectCheck.channel().closeFuture().awaitUninterruptibly();
+            } catch (Exception e) {
+                shutdown();
+                if (connectCheck != null) {
+                    connectCheck.cancel(true);
+                    connectCheck.channel().closeFuture().awaitUninterruptibly();
+                }
                 throw e;
             }
         }
@@ -265,11 +270,10 @@ public void shutdown() {
         allChannels.close().awaitUninterruptibly();
         if (serverChannelFuture != null) {
             serverChannelFuture.channel().closeFuture();
-            bossGroup.shutdownGracefully();
-            workerGroup.shutdownGracefully();
-
             // Wait until all threads are terminated.
             try {
+                bossGroup.shutdownGracefully().sync();
+                workerGroup.shutdownGracefully().sync();
                 bossGroup.terminationFuture().sync();
                 workerGroup.terminationFuture().sync();
             } catch (InterruptedException e) {
@@ -278,6 +282,9 @@ public void shutdown() {
             }
 
         }
+        if (clientGroup != null) {
+            clientGroup.shutdownGracefully().syncUninterruptibly();
+        }
         // Shut down all event loops to terminate all threads.
 
         processPendingDisconnects();