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

Mirror unlock-via-script calls to the cache cluster.

This commit is contained in:
Jon Chambers 2020-06-10 22:27:58 -04:00 committed by Jon Chambers
parent 58a8ed1588
commit 75cbfa2898
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerCache.java
View File

@ -16,8 +16,10 @@
*/ */
package org.whispersystems.textsecuregcm.storage; package org.whispersystems.textsecuregcm.storage;
import io.lettuce.core.ScriptOutputType;
import io.lettuce.core.SetArgs; import io.lettuce.core.SetArgs;
import org.whispersystems.textsecuregcm.experiment.Experiment; import org.whispersystems.textsecuregcm.experiment.Experiment;
import org.whispersystems.textsecuregcm.redis.ClusterLuaScript;
import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster; import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
import org.whispersystems.textsecuregcm.redis.LuaScript; import org.whispersystems.textsecuregcm.redis.LuaScript;
import org.whispersystems.textsecuregcm.redis.ReplicatedJedisPool; import org.whispersystems.textsecuregcm.redis.ReplicatedJedisPool;
@ -41,13 +43,15 @@ public class AccountDatabaseCrawlerCache {
private final ReplicatedJedisPool jedisPool; private final ReplicatedJedisPool jedisPool;
private final FaultTolerantRedisCluster cacheCluster; private final FaultTolerantRedisCluster cacheCluster;
private final LuaScript luaScript; private final LuaScript unlockScript;
private final ClusterLuaScript unlockClusterScript;
private final Experiment redisClusterExperiment = new Experiment("RedisCluster", "AccountDatabaseCrawlerCache"); private final Experiment redisClusterExperiment = new Experiment("RedisCluster", "AccountDatabaseCrawlerCache");
public AccountDatabaseCrawlerCache(ReplicatedJedisPool jedisPool, FaultTolerantRedisCluster cacheCluster) throws IOException { public AccountDatabaseCrawlerCache(ReplicatedJedisPool jedisPool, FaultTolerantRedisCluster cacheCluster) throws IOException {
this.jedisPool = jedisPool; this.jedisPool = jedisPool;
this.cacheCluster = cacheCluster; this.cacheCluster = cacheCluster;
this.luaScript = LuaScript.fromResource(jedisPool, "lua/account_database_crawler/unlock.lua"); this.unlockScript = LuaScript.fromResource(jedisPool, "lua/account_database_crawler/unlock.lua");
this.unlockClusterScript = ClusterLuaScript.fromResource(cacheCluster, "lua/account_database_crawler/unlock.lua", ScriptOutputType.INTEGER);
} }
public void clearAccelerate() { public void clearAccelerate() {
@ -82,7 +86,8 @@ public class AccountDatabaseCrawlerCache {
public void releaseActiveWork(String workerId) { public void releaseActiveWork(String workerId) {
List<byte[]> keys = Arrays.asList(ACTIVE_WORKER_KEY.getBytes()); List<byte[]> keys = Arrays.asList(ACTIVE_WORKER_KEY.getBytes());
List<byte[]> args = Arrays.asList(workerId.getBytes()); List<byte[]> args = Arrays.asList(workerId.getBytes());
luaScript.execute(keys, args); unlockScript.execute(keys, args);
unlockClusterScript.execute(List.of(ACTIVE_WORKER_KEY), List.of(workerId));
} }
public Optional<UUID> getLastUuid() { public Optional<UUID> getLastUuid() {