From 00b5cfcf17a21bdb7f727ac7aea14dff2d3d231d Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Sat, 16 Jan 2021 02:39:27 -0500
Subject: [PATCH] Allow the client presence manager to use an entirely separate
 cluster.

---
 .../textsecuregcm/WhisperServerConfiguration.java        | 9 +++++++++
 .../textsecuregcm/WhisperServerService.java              | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
index a2ba77abb..ef64e6908 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
@@ -112,6 +112,11 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private MessageCacheConfiguration messageCache;
 
+  @NotNull
+  @Valid
+  @JsonProperty
+  private RedisClusterConfiguration clientPresenceCluster;
+
   @Valid
   @NotNull
   @JsonProperty
@@ -274,6 +279,10 @@ public class WhisperServerConfiguration extends Configuration {
     return messageCache;
   }
 
+  public RedisClusterConfiguration getClientPresenceClusterConfiguration() {
+    return clientPresenceCluster;
+  }
+
   public RedisConfiguration getPushScheduler() {
     return pushScheduler;
   }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 2a6c11914..98b264c96 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -283,7 +283,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
 
     ClientResources generalCacheClientResources = ClientResources.builder().build();
     ClientResources messageCacheClientResources = ClientResources.builder().ioThreadPoolSize(128).build();
-    ClientResources presenceClientResources     = ClientResources.builder().ioThreadPoolSize(128).build();
+    ClientResources presenceClientResources     = ClientResources.builder().build();
     ClientResources metricsCacheClientResources = ClientResources.builder().build();
 
     ConnectionEventLogger.logConnectionEvents(generalCacheClientResources);
@@ -293,7 +293,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
 
     FaultTolerantRedisCluster cacheCluster             = new FaultTolerantRedisCluster("main_cache_cluster", config.getCacheClusterConfiguration(), generalCacheClientResources);
     FaultTolerantRedisCluster messagesCluster          = new FaultTolerantRedisCluster("message_insert_cluster", config.getMessageCacheConfiguration().getRedisClusterConfiguration(), messageCacheClientResources);
-    FaultTolerantRedisCluster clientPresenceCluster    = new FaultTolerantRedisCluster("client_presence_cluster", config.getMessageCacheConfiguration().getRedisClusterConfiguration(), presenceClientResources);
+    FaultTolerantRedisCluster clientPresenceCluster    = new FaultTolerantRedisCluster("client_presence_cluster", config.getClientPresenceClusterConfiguration(), presenceClientResources);
     FaultTolerantRedisCluster metricsCluster           = new FaultTolerantRedisCluster("metrics_cluster", config.getMetricsClusterConfiguration(), metricsCacheClientResources);
 
     BlockingQueue<Runnable> keyspaceNotificationDispatchQueue = new ArrayBlockingQueue<>(10_000);