Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 20:48:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stop queue persistence attempt if items aren’t removed from cache

Browse Source
This commit is contained in:
Chris Eager
2022-07-27 13:35:05 -05:00
committed by Chris Eager
parent 4cfcdb0c96
commit 41a113e22c
4 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersistenceException.java Normal file
View File

@@ -0,0 +1,13 @@
/*
* Copyright 2022 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.whispersystems.textsecuregcm.storage;
public class MessagePersistenceException extends Exception {
public MessagePersistenceException(String message) {
super(message);
}
}

17
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java
View File

@@ -53,6 +53,8 @@ public class MessagePersister implements Managed {
private static final String DISABLE_PERSISTER_FEATURE_FLAG = "DISABLE_MESSAGE_PERSISTER";
private static final int WORKER_THREAD_COUNT = 4;
private static final int CONSECUTIVE_EMPTY_CACHE_REMOVAL_LIMIT = 3;
private static final Logger logger = LoggerFactory.getLogger(MessagePersister.class);
public MessagePersister(final MessagesCache messagesCache, final MessagesManager messagesManager,
@@ -150,7 +152,7 @@ public class MessagePersister implements Managed {
}
@VisibleForTesting
void persistQueue(final UUID accountUuid, final long deviceId) {
void persistQueue(final UUID accountUuid, final long deviceId) throws MessagePersistenceException {
final Optional<Account> maybeAccount = accountsManager.getByAccountIdentifier(accountUuid);
if (maybeAccount.isEmpty()) {
@@ -165,12 +167,23 @@ public class MessagePersister implements Managed {
int messageCount = 0;
List<MessageProtos.Envelope> messages;
int consecutiveEmptyCacheRemovals = 0;
do {
messages = messagesCache.getMessagesToPersist(accountUuid, deviceId, MESSAGE_BATCH_LIMIT);
messagesManager.persistMessages(accountUuid, deviceId, messages);
int messagesRemovedFromCache = messagesManager.persistMessages(accountUuid, deviceId, messages);
messageCount += messages.size();
if (messagesRemovedFromCache == 0) {
consecutiveEmptyCacheRemovals += 1;
} else {
consecutiveEmptyCacheRemovals = 0;
}
if (consecutiveEmptyCacheRemovals > CONSECUTIVE_EMPTY_CACHE_REMOVAL_LIMIT) {
throw new MessagePersistenceException("persistence failure loop detected");
}
} while (!messages.isEmpty());

13
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java
View File

@@ -104,7 +104,10 @@ public class MessagesManager {
return removed;
}
public void persistMessages(
/**
* @return the number of messages successfully removed from the cache.
*/
public int persistMessages(
final UUID destinationUuid,
final long destinationDeviceId,
final List<Envelope> messages) {
@@ -114,10 +117,14 @@ public class MessagesManager {
.collect(Collectors.toList());
messagesDynamoDb.store(nonEphemeralMessages, destinationUuid, destinationDeviceId);
messagesCache.remove(destinationUuid, destinationDeviceId,
messages.stream().map(message -> UUID.fromString(message.getServerGuid())).collect(Collectors.toList()));
final List<UUID> messageGuids = messages.stream().map(message -> UUID.fromString(message.getServerGuid()))
.collect(Collectors.toList());
int messagesRemovedFromCache = messagesCache.remove(destinationUuid, destinationDeviceId, messageGuids).size();
persistMessageMeter.mark(nonEphemeralMessages.size());
return messagesRemovedFromCache;
}
public void addMessageAvailabilityListener(