MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Re-nerf the clustered message persister.

This commit is contained in:
Jon Chambers 2020-08-20 11:53:48 -04:00 committed by Jon Chambers
parent 6a76afc20d
commit bfe18d1d28
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersister.java
View File

@ -130,7 +130,7 @@ public class RedisClusterMessagePersister implements Managed {
messagesCache.lockQueueForPersistence(queue); messagesCache.lockQueueForPersistence(queue);
try { try {
int messageCount = 0; /* int messageCount = 0;
List<MessageProtos.Envelope> messages; List<MessageProtos.Envelope> messages;
do { do {
@ -146,7 +146,7 @@ public class RedisClusterMessagePersister implements Managed {
} }
} while (!messages.isEmpty()); } while (!messages.isEmpty());
queueSizeHistogram.update(messageCount); queueSizeHistogram.update(messageCount); */
} finally { } finally {
messagesCache.unlockQueueForPersistence(queue); messagesCache.unlockQueueForPersistence(queue);
} }

2
service/src/test/java/org/whispersystems/textsecuregcm/storage/RedisClusterMessagePersisterTest.java
View File

@ -4,6 +4,7 @@ import com.google.protobuf.ByteString;
import io.lettuce.core.cluster.SlotHash; import io.lettuce.core.cluster.SlotHash;
import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.RandomStringUtils;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.whispersystems.textsecuregcm.entities.MessageProtos; import org.whispersystems.textsecuregcm.entities.MessageProtos;
import org.whispersystems.textsecuregcm.push.PushSender; 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.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@Ignore
public class RedisClusterMessagePersisterTest extends AbstractRedisClusterTest { public class RedisClusterMessagePersisterTest extends AbstractRedisClusterTest {
private ExecutorService notificationExecutorService; private ExecutorService notificationExecutorService;