From f1a74b593919739d86f66defb8adf174507c41f8 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Fri, 14 Aug 2020 15:51:43 -0400
Subject: [PATCH] Disarm new message keyspace notifications.

---
 .../textsecuregcm/storage/RedisClusterMessagesCache.java      | 4 ++--
 .../textsecuregcm/storage/RedisClusterMessagesCacheTest.java  | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCache.java
index bebda380e..cea5bfe79 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCache.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCache.java
@@ -83,7 +83,7 @@ public class RedisClusterMessagesCache extends RedisClusterPubSubAdapter<String,
         this.removeQueueScript        = ClusterLuaScript.fromResource(redisCluster, "lua/remove_queue.lua",          ScriptOutputType.STATUS);
         this.getQueuesToPersistScript = ClusterLuaScript.fromResource(redisCluster, "lua/get_queues_to_persist.lua", ScriptOutputType.MULTI);
 
-        pubSubConnection.usePubSubConnection(connection -> {
+        /* pubSubConnection.usePubSubConnection(connection -> {
             connection.addListener(this);
             connection.getResources().eventBus().get()
                     .filter(event -> event instanceof ClusterTopologyChangedEvent)
@@ -93,7 +93,7 @@ public class RedisClusterMessagesCache extends RedisClusterPubSubAdapter<String,
                     });
         });
 
-        subscribeForKeyspaceNotifications();
+        subscribeForKeyspaceNotifications(); */
     }
 
     private void subscribeForKeyspaceNotifications() {
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCacheTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCacheTest.java
index 4202fe521..123a5b0a7 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCacheTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagesCacheTest.java
@@ -3,6 +3,7 @@ package org.whispersystems.textsecuregcm.storage;
 import io.lettuce.core.cluster.SlotHash;
 import junitparams.Parameters;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.nio.charset.StandardCharsets;
@@ -103,6 +104,7 @@ public class RedisClusterMessagesCacheTest extends AbstractMessagesCacheTest {
     }
 
     @Test(timeout = 5_000L)
+    @Ignore
     public void testNotifyListenerNewMessage() throws InterruptedException {
         final AtomicBoolean notified    = new AtomicBoolean(false);
         final UUID          messageGuid = UUID.randomUUID();
@@ -134,6 +136,7 @@ public class RedisClusterMessagesCacheTest extends AbstractMessagesCacheTest {
     }
 
     @Test(timeout = 5_000L)
+    @Ignore
     public void testNotifyListenerPersisted() throws InterruptedException {
         final AtomicBoolean notified    = new AtomicBoolean(false);