From 321e6e66794edbed5f48672f2ae9f0bf51115921 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Sun, 10 Jan 2021 12:49:34 -0500
Subject: [PATCH] Don't validate cluster membership (allow new shards to join
 dynamically).

---
 .../textsecuregcm/redis/FaultTolerantRedisCluster.java          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
index c613deaa8..ef8536058 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
@@ -13,6 +13,7 @@ import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 import io.github.resilience4j.retry.Retry;
 import io.lettuce.core.RedisCommandTimeoutException;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.cluster.ClusterClientOptions;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
 import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection;
@@ -77,6 +78,7 @@ public class FaultTolerantRedisCluster {
 
         this.clusterClient = clusterClient;
         this.clusterClient.setDefaultTimeout(commandTimeout);
+        this.clusterClient.setOptions(ClusterClientOptions.builder().validateClusterNodeMembership(false).build());
 
         this.stringConnection = clusterClient.connect();
         this.binaryConnection = clusterClient.connect(ByteArrayCodec.INSTANCE);