From bfe18d1d28db409d4527a04ab45c3fed745413fb Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Thu, 20 Aug 2020 11:53:48 -0400 Subject: [PATCH] Re-nerf the clustered 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 e32a86d8b..c199b8923 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersister.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersister.java @@ -130,7 +130,7 @@ public class RedisClusterMessagePersister implements Managed { messagesCache.lockQueueForPersistence(queue); try { - int messageCount = 0; + /* int messageCount = 0; List messages; do { @@ -146,7 +146,7 @@ public class RedisClusterMessagePersister implements Managed { } } while (!messages.isEmpty()); - queueSizeHistogram.update(messageCount); + queueSizeHistogram.update(messageCount); */ } finally { messagesCache.unlockQueueForPersistence(queue); } 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 1e0930fb2..4ae56d558 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersisterTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersisterTest.java @@ -4,6 +4,7 @@ import com.google.protobuf.ByteString; import io.lettuce.core.cluster.SlotHash; 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; @@ -28,6 +29,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@Ignore public class RedisClusterMessagePersisterTest extends AbstractRedisClusterTest { private ExecutorService notificationExecutorService;