From baf563e46d355dde040c20470173349b06e26d7b Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 30 Jul 2020 16:06:33 -0400
Subject: [PATCH] Temporarily disarm the actual persisting part of the message
 persister.

---
 .../textsecuregcm/storage/RedisClusterMessagePersister.java   | 4 ++--
 .../storage/RedisClusterMessagePersisterTest.java             | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersister.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersister.java
index 5b28e6d43..f2c7e585e 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersister.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersister.java
@@ -128,7 +128,7 @@ public class RedisClusterMessagePersister implements Managed {
                 int messageCount = 0;
                 List<MessageProtos.Envelope> messages;
 
-                do {
+                /* do {
                     messages = messagesCache.getMessagesToPersist(accountUuid, deviceId, MESSAGE_BATCH_LIMIT);
 
                     for (final MessageProtos.Envelope message : messages) {
@@ -139,7 +139,7 @@ public class RedisClusterMessagePersister implements Managed {
 
                         messageCount++;
                     }
-                } while (messages.size() == MESSAGE_BATCH_LIMIT);
+                } while (messages.size() == MESSAGE_BATCH_LIMIT); */
 
                 queueSizeHistogram.update(messageCount);
             } finally {
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersisterTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersisterTest.java
index e0c62fe7a..08c6ad0ea 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersisterTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersisterTest.java
@@ -3,6 +3,7 @@ package org.whispersystems.textsecuregcm.storage;
 import com.google.protobuf.ByteString;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.whispersystems.textsecuregcm.entities.MessageProtos;
 import org.whispersystems.textsecuregcm.push.PushSender;
@@ -27,6 +28,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+@Ignore
 public class RedisClusterMessagePersisterTest {
 
     private RedisClusterMessagesCache    messagesCache;