From 4e131858ca244024fff63ab1831c0eecfee92051 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 27 Jun 2022 17:04:20 -0400
Subject: [PATCH] Generalize scope of and expand size of websocket scheduled
 executor service

---
 .../textsecuregcm/WhisperServerService.java          |  4 ++--
 .../websocket/AuthenticatedConnectListener.java      |  8 ++++----
 .../textsecuregcm/websocket/WebSocketConnection.java | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 16d398507..f0d6b08cf 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -372,7 +372,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
 
     ScheduledExecutorService recurringJobExecutor = environment.lifecycle()
         .scheduledExecutorService(name(getClass(), "recurringJob-%d")).threads(6).build();
-    ScheduledExecutorService retrySchedulingExecutor              = environment.lifecycle().scheduledExecutorService(name(getClass(), "retry-%d")).threads(2).build();
+    ScheduledExecutorService websocketScheduledExecutor           = environment.lifecycle().scheduledExecutorService(name(getClass(), "websocket-%d")).threads(8).build();
     ExecutorService          keyspaceNotificationDispatchExecutor = environment.lifecycle().executorService(name(getClass(), "keyspaceNotification-%d")).maxThreads(16).workQueue(keyspaceNotificationDispatchQueue).build();
     ExecutorService          apnSenderExecutor                    = environment.lifecycle().executorService(name(getClass(), "apnSender-%d")).maxThreads(1).minThreads(1).build();
     ExecutorService          gcmSenderExecutor                    = environment.lifecycle().executorService(name(getClass(), "gcmSender-%d")).maxThreads(1).minThreads(1).build();
@@ -604,7 +604,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     webSocketEnvironment.setAuthenticator(new WebSocketAccountAuthenticator(accountAuthenticator));
     webSocketEnvironment.setConnectListener(
         new AuthenticatedConnectListener(receiptSender, messagesManager, messageSender, apnFallbackManager,
-            clientPresenceManager, retrySchedulingExecutor));
+            clientPresenceManager, websocketScheduledExecutor));
     webSocketEnvironment.jersey().register(new WebsocketRefreshApplicationEventListener(accountsManager, clientPresenceManager));
     webSocketEnvironment.jersey().register(new ContentLengthFilter(TrafficSource.WEBSOCKET));
     webSocketEnvironment.jersey().register(MultiDeviceMessageListProvider.class);
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java
index 696a53e6c..a4460173e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/AuthenticatedConnectListener.java
@@ -40,20 +40,20 @@ public class AuthenticatedConnectListener implements WebSocketConnectListener {
   private final MessageSender         messageSender;
   private final ApnFallbackManager    apnFallbackManager;
   private final ClientPresenceManager clientPresenceManager;
-  private final ScheduledExecutorService retrySchedulingExecutor;
+  private final ScheduledExecutorService scheduledExecutorService;
 
   public AuthenticatedConnectListener(ReceiptSender receiptSender,
       MessagesManager messagesManager,
       final MessageSender messageSender, ApnFallbackManager apnFallbackManager,
       ClientPresenceManager clientPresenceManager,
-      ScheduledExecutorService retrySchedulingExecutor)
+      ScheduledExecutorService scheduledExecutorService)
   {
     this.receiptSender         = receiptSender;
     this.messagesManager       = messagesManager;
     this.messageSender         = messageSender;
     this.apnFallbackManager    = apnFallbackManager;
     this.clientPresenceManager = clientPresenceManager;
-    this.retrySchedulingExecutor = retrySchedulingExecutor;
+    this.scheduledExecutorService = scheduledExecutorService;
   }
 
   @Override
@@ -65,7 +65,7 @@ public class AuthenticatedConnectListener implements WebSocketConnectListener {
       final WebSocketConnection connection = new WebSocketConnection(receiptSender,
           messagesManager, auth, device,
           context.getClient(),
-          retrySchedulingExecutor);
+          scheduledExecutorService);
 
       openWebsocketCounter.inc();
       RedisOperation.unchecked(() -> apnFallbackManager.cancel(auth.getAccount(), device));
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
index 9d10bc7f0..52c688934 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnection.java
@@ -101,7 +101,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
 
   private final int sendFuturesTimeoutMillis;
 
-  private final ScheduledExecutorService retrySchedulingExecutor;
+  private final ScheduledExecutorService scheduledExecutorService;
 
   private final boolean isDesktopClient;
 
@@ -127,7 +127,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
       AuthenticatedAccount auth,
       Device device,
       WebSocketClient client,
-      ScheduledExecutorService retrySchedulingExecutor) {
+      ScheduledExecutorService scheduledExecutorService) {
 
     this(receiptSender,
         messagesManager,
@@ -135,7 +135,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
         device,
         client,
         DEFAULT_SEND_FUTURES_TIMEOUT_MILLIS,
-        retrySchedulingExecutor);
+        scheduledExecutorService);
   }
 
   @VisibleForTesting
@@ -145,7 +145,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
       Device device,
       WebSocketClient client,
       int sendFuturesTimeoutMillis,
-      ScheduledExecutorService retrySchedulingExecutor) {
+      ScheduledExecutorService scheduledExecutorService) {
 
     this.receiptSender = receiptSender;
     this.messagesManager = messagesManager;
@@ -153,7 +153,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
     this.device = device;
     this.client = client;
     this.sendFuturesTimeoutMillis = sendFuturesTimeoutMillis;
-    this.retrySchedulingExecutor = retrySchedulingExecutor;
+    this.scheduledExecutorService = scheduledExecutorService;
 
     Optional<ClientPlatform> maybePlatform;
 
@@ -294,7 +294,7 @@ public class WebSocketConnection implements MessageAvailabilityListener, Displac
 
               final long delay = RETRY_DELAY_MILLIS + random.nextInt(RETRY_DELAY_JITTER_MILLIS);
               retryFuture
-                  .set(retrySchedulingExecutor.schedule(this::processStoredMessages, delay, TimeUnit.MILLISECONDS));
+                  .set(scheduledExecutorService.schedule(this::processStoredMessages, delay, TimeUnit.MILLISECONDS));
             }
           } else {
             logger.debug("Client disconnected before queue cleared");