From 38f9b8f3ddbe6ca31ae29bcb7efe074c2955b766 Mon Sep 17 00:00:00 2001 From: Jon Chambers Date: Wed, 17 Jun 2020 09:57:30 -0400 Subject: [PATCH] Make write operations in `AccountDatabaseCrawlerCache` synchronous. --- .../storage/AccountDatabaseCrawlerCache.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerCache.java index 91e982004..499e77d2a 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerCache.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerCache.java @@ -62,7 +62,7 @@ public class AccountDatabaseCrawlerCache { public void clearAccelerate() { try (Jedis jedis = jedisPool.getWriteResource()) { jedis.del(ACCELERATE_KEY); - cacheCluster.useWriteCluster(connection -> connection.async().del(ACCELERATE_KEY)); + cacheCluster.useWriteCluster(connection -> connection.sync().del(ACCELERATE_KEY)); } } @@ -81,7 +81,7 @@ public class AccountDatabaseCrawlerCache { if (claimed) { // TODO Restore the NX flag when making the cluster the primary data store - cacheCluster.useWriteCluster(connection -> connection.async().set(ACCELERATE_KEY, workerId, SetArgs.Builder.px(ttlMs))); + cacheCluster.useWriteCluster(connection -> connection.sync().set(ACCELERATE_KEY, workerId, SetArgs.Builder.px(ttlMs))); } return claimed; @@ -114,10 +114,10 @@ public class AccountDatabaseCrawlerCache { try (Jedis jedis = jedisPool.getWriteResource()) { if (lastUuid.isPresent()) { jedis.psetex(LAST_UUID_KEY, LAST_NUMBER_TTL_MS, lastUuid.get().toString()); - cacheCluster.useWriteCluster(connection -> connection.async().psetex(LAST_UUID_KEY, LAST_NUMBER_TTL_MS, lastUuid.get().toString())); + cacheCluster.useWriteCluster(connection -> connection.sync().psetex(LAST_UUID_KEY, LAST_NUMBER_TTL_MS, lastUuid.get().toString())); } else { jedis.del(LAST_UUID_KEY); - cacheCluster.useWriteCluster(connection -> connection.async().del(LAST_UUID_KEY)); + cacheCluster.useWriteCluster(connection -> connection.sync().del(LAST_UUID_KEY)); } } }