OF-2559 Ensure NioEventLoopGroup is closed for outbound S2S

We were seeing resource limit issues (too many open files) when running Outgoing S2S tests. This was caused by the outbound session initialisation failing to clean up its NioEventLoopGroup in many scenarios.
igniterealtime · Jul 27, 2023 · b25f6ba · b25f6ba
1 parent c095508
commit b25f6ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettySessionInitializer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettySessionInitializer.java
@@ -54,7 +54,7 @@ public class NettySessionInitializer {
     private final DomainPair domainPair;
     private final int port;
     private  boolean directTLS = false;
-    private EventLoopGroup workerGroup;
+    private final EventLoopGroup workerGroup;
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
     private Channel channel;
 
@@ -118,6 +118,9 @@ public boolean exceptionOccurredForDirectTLS(Throwable cause) {
 
             this.channel = b.connect(socketAddress).sync().channel();
 
+            // Make sure we free up resources (worker group NioEventLoopGroup) when the channel is closed
+            this.channel.closeFuture().addListener(future -> stop());
+
             // Start the session negotiation
             sendOpeningStreamHeader(channel);
 

diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
@@ -260,16 +260,10 @@ static LocalOutgoingServerSession createOutgoingSession(@Nonnull final DomainPai
             // Wait for the future to give us a session...
             // Set a read timeout so that we don't keep waiting forever
             return (LocalOutgoingServerSession) sessionInitialiser.init(listenerConfiguration).get(INITIALISE_TIMEOUT_SECONDS.getValue().getSeconds(), TimeUnit.SECONDS);
-        } catch (ExecutionException e) {
+        } catch (Exception e) {
             // This might be RFC6120, section 5.4.2.2 "Failure Case" or even an unrelated problem. Handle 'normally'.
-            log.warn("An exception occurred while creating an encrypted session. Closing connection.", e);
-            sessionInitialiser.stop();
-            return null;
-        } catch (TimeoutException e) {
-            log.warn("Timed out waiting for session creation. Closing connection.", e);
-            sessionInitialiser.stop();
-        } catch (InterruptedException e) {
-            log.warn("An exception occurred while creating an encrypted session. Closing connection.", e);
+            log.warn("An exception occurred while creating a session. Closing connection.", e);
+        } finally {
             sessionInitialiser.stop();
         }