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

Add a task to enable/disable accelerated crawling.

This commit is contained in:
Jon Chambers 2021-01-11 18:51:20 -05:00 committed by Jon Chambers
parent 8fb37a0024
commit 2e01da5ec1
5 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@ -150,6 +150,7 @@ import org.whispersystems.textsecuregcm.workers.DisableRequestLoggingTask;
import org.whispersystems.textsecuregcm.workers.EnableRequestLoggingTask;
import org.whispersystems.textsecuregcm.workers.GetRedisCommandStatsCommand;
import org.whispersystems.textsecuregcm.workers.GetRedisSlowlogCommand;
import org.whispersystems.textsecuregcm.workers.SetCrawlerAccelerationTask;
import org.whispersystems.textsecuregcm.workers.VacuumCommand;
import org.whispersystems.textsecuregcm.workers.ZkParamsCommand;
import org.whispersystems.websocket.WebSocketResourceProviderFactory;
@ -448,6 +449,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
environment.admin().addTask(new EnableRequestLoggingTask());
environment.admin().addTask(new DisableRequestLoggingTask());
environment.admin().addTask(new SetCrawlerAccelerationTask(accountDatabaseCrawlerCache));
///

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

@ -122,7 +122,7 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
logger.info("Finished crawl");
listeners.forEach(listener -> listener.onCrawlEnd(fromUuid));
cache.setLastUuid(Optional.empty());
cache.clearAccelerate();
cache.setAccelerated(false);
} else {
try {
for (AccountDatabaseCrawlerListener listener : listeners) {
@ -131,7 +131,7 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
cache.setLastUuid(Optional.of(chunkAccounts.get(chunkAccounts.size() - 1).getUuid()));
} catch (AccountDatabaseCrawlerRestartException e) {
cache.setLastUuid(Optional.empty());
cache.clearAccelerate();
cache.setAccelerated(false);
}
}

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

@ -31,8 +31,12 @@ public class AccountDatabaseCrawlerCache {
this.unlockClusterScript = ClusterLuaScript.fromResource(cacheCluster, "lua/account_database_crawler/unlock.lua", ScriptOutputType.INTEGER);
}
public void clearAccelerate() {
cacheCluster.useCluster(connection -> connection.sync().del(ACCELERATE_KEY));
public void setAccelerated(final boolean accelerated) {
if (accelerated) {
cacheCluster.useCluster(connection -> connection.sync().set(ACCELERATE_KEY, "1"));
} else {
cacheCluster.useCluster(connection -> connection.sync().del(ACCELERATE_KEY));
}
}
public boolean isAccelerated() {

36
service/src/main/java/org/whispersystems/textsecuregcm/workers/SetCrawlerAccelerationTask.java Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright 2021 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only
*/
package org.whispersystems.textsecuregcm.workers;
import io.dropwizard.servlets.tasks.Task;
import org.whispersystems.textsecuregcm.storage.AccountDatabaseCrawlerCache;
import java.io.PrintWriter;
import java.util.List;
import java.util.Map;
public class SetCrawlerAccelerationTask extends Task {
private final AccountDatabaseCrawlerCache crawlerCache;
public SetCrawlerAccelerationTask(final AccountDatabaseCrawlerCache crawlerCache) {
super("set-crawler-accelerated");
this.crawlerCache = crawlerCache;
}
@Override
public void execute(final Map<String, List<String>> parameters, final PrintWriter out) {
if (parameters.containsKey("accelerated") && parameters.get("accelerated").size() == 1) {
final boolean accelerated = "true".equalsIgnoreCase(parameters.get("accelerated").get(0));
crawlerCache.setAccelerated(accelerated);
out.println("Set accelerated: " + accelerated);
} else {
out.println("Usage: set-crawler-accelerated?accelerated=[true|false]");
}
}
}

4
service/src/test/java/org/whispersystems/textsecuregcm/tests/storage/AccountDatabaseCrawlerTest.java
View File

@ -148,7 +148,7 @@ public class AccountDatabaseCrawlerTest {
verify(account2, times(0)).getNumber();
verify(listener, times(1)).timeAndProcessCrawlChunk(eq(Optional.of(ACCOUNT1)), eq(Arrays.asList(account2)));
verify(cache, times(1)).setLastUuid(eq(Optional.empty()));
verify(cache, times(1)).clearAccelerate();
verify(cache, times(1)).setAccelerated(false);
verify(cache, times(1)).isAccelerated();
verify(cache, times(1)).releaseActiveWork(any(String.class));
@ -175,7 +175,7 @@ public class AccountDatabaseCrawlerTest {
verify(account2, times(0)).getNumber();
verify(listener, times(1)).onCrawlEnd(eq(Optional.of(ACCOUNT2)));
verify(cache, times(1)).setLastUuid(eq(Optional.empty()));
verify(cache, times(1)).clearAccelerate();
verify(cache, times(1)).setAccelerated(false);
verify(cache, times(1)).isAccelerated();
verify(cache, times(1)).releaseActiveWork(any(String.class));