From 7bf8650d59d1db46a08c485f0cb51901fdf3d39a Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 30 Jul 2020 18:20:37 -0400
Subject: [PATCH] Un-manage FaultTolerantRedisCluster so it shuts down at JVM
 shutdown instead of Jetty shutdown.

---
 .../textsecuregcm/WhisperServerService.java      |  1 -
 .../redis/FaultTolerantRedisCluster.java         | 16 +++++-----------
 .../redis/AbstractRedisClusterTest.java          |  2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index bf9dfcbcf..5b78237b3 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -382,7 +382,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     environment.lifecycle().manage(messagesCache);
     environment.lifecycle().manage(accountDatabaseCrawler);
     environment.lifecycle().manage(remoteConfigsManager);
-    environment.lifecycle().manage(cacheCluster);
     environment.lifecycle().manage(clusterMessagePersister);
 
     AWSCredentials         credentials               = new BasicAWSCredentials(config.getCdnConfiguration().getAccessKey(), config.getCdnConfiguration().getAccessSecret());
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 7650d05ad..ca3467285 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java
@@ -2,7 +2,6 @@ package org.whispersystems.textsecuregcm.redis;
 
 import com.codahale.metrics.SharedMetricRegistries;
 import com.google.common.annotations.VisibleForTesting;
-import io.dropwizard.lifecycle.Managed;
 import io.github.resilience4j.circuitbreaker.CircuitBreaker;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.cluster.RedisClusterClient;
@@ -23,7 +22,7 @@ import java.util.stream.Collectors;
  * read and write operations because the leader in a Redis cluster shard may fail while its read-only replicas can still
  * serve traffic.
  */
-public class FaultTolerantRedisCluster implements Managed {
+public class FaultTolerantRedisCluster {
 
     private final RedisClusterClient clusterClient;
 
@@ -56,6 +55,10 @@ public class FaultTolerantRedisCluster implements Managed {
                 FaultTolerantRedisCluster.class);
     }
 
+    void shutdown() {
+        clusterClient.shutdown();
+    }
+
     public void useReadCluster(final Consumer<StatefulRedisClusterConnection<String, String>> consumer) {
         this.readCircuitBreaker.executeRunnable(() -> consumer.accept(stringClusterConnection));
     }
@@ -87,13 +90,4 @@ public class FaultTolerantRedisCluster implements Managed {
     public <T> T withBinaryWriteCluster(final Function<StatefulRedisClusterConnection<byte[], byte[]>, T> consumer) {
         return this.writeCircuitBreaker.executeSupplier(() -> consumer.apply(binaryClusterConnection));
     }
-
-    @Override
-    public void start() {
-    }
-
-    @Override
-    public void stop() {
-        clusterClient.shutdown();
-    }
 }
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/redis/AbstractRedisClusterTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/redis/AbstractRedisClusterTest.java
index b49598a92..a5eeb4cda 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/redis/AbstractRedisClusterTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/redis/AbstractRedisClusterTest.java
@@ -64,7 +64,7 @@ public abstract class AbstractRedisClusterTest {
 
     @After
     public void tearDown() throws Exception {
-        redisCluster.stop();
+        redisCluster.shutdown();
     }
 
     @AfterClass