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

Don't panic if a queue exists, but is empty when repairing metadata.

This commit is contained in:
Jon Chambers 2020-10-04 16:02:10 -04:00 committed by Jon Chambers
parent 899b54c082
commit bb087caddc
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
service/src/main/resources/lua/repair_queue_metadata.lua
View File

@ -1,13 +1,10 @@
local queueKey = KEYS[1] local queueKey = KEYS[1]
local queueMetadataKey = KEYS[2] local queueMetadataKey = KEYS[2]
local firstMessageWithScore = redis.call("ZRANGE", queueKey, 0, 0, "WITHSCORES") local firstMessageId = tonumber(redis.call("ZRANGE", queueKey, 0, 0, "WITHSCORES")[2])
local lastMessageWithScore = redis.call("ZRANGE", queueKey, -1, -1, "WITHSCORES") local lastMessageId = tonumber(redis.call("ZRANGE", queueKey, -1, -1, "WITHSCORES")[2])
if firstMessageWithScore ~= nil and lastMessageWithScore ~= nil then
local firstMessageId = tonumber(firstMessageWithScore[2])
local lastMessageId = tonumber(lastMessageWithScore[2])
if firstMessageId and lastMessageId then
for messageId = firstMessageId,lastMessageId do for messageId = firstMessageId,lastMessageId do
if redis.call("ZRANGEBYSCORE", queueKey, messageId, messageId) then if redis.call("ZRANGEBYSCORE", queueKey, messageId, messageId) then
-- This message actually exists, and its GUID may be pointing to the wrong ID -- This message actually exists, and its GUID may be pointing to the wrong ID

6
service/src/test/java/org/whispersystems/textsecuregcm/storage/MessagesCacheTest.java
View File

@ -120,6 +120,12 @@ public class MessagesCacheTest extends AbstractRedisClusterTest {
assertTrue(messagesCache.getMessagesToPersist(DESTINATION_UUID, DESTINATION_DEVICE_ID, 100).isEmpty()); assertTrue(messagesCache.getMessagesToPersist(DESTINATION_UUID, DESTINATION_DEVICE_ID, 100).isEmpty());
} }
@Test
public void testRepairEmptyQueueMetadata() {
// We're happy as long as this doesn't throw an exception
messagesCache.repairMetadata(DESTINATION_UUID, DESTINATION_DEVICE_ID);
}
@Test @Test
@Parameters({"true", "false"}) @Parameters({"true", "false"})
public void testRemoveById(final boolean sealedSender) { public void testRemoveById(final boolean sealedSender) {