account crawler: remove obsolete accelerated mode

service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java

@@ -217,7 +217,6 @@ import org.whispersystems.textsecuregcm.workers.CertificateCommand;
 import org.whispersystems.textsecuregcm.workers.CheckDynamicConfigurationCommand;
 import org.whispersystems.textsecuregcm.workers.DeleteUserCommand;
 import org.whispersystems.textsecuregcm.workers.ServerVersionCommand;
-import org.whispersystems.textsecuregcm.workers.SetCrawlerAccelerationTask;
 import org.whispersystems.textsecuregcm.workers.SetRequestLoggingEnabledTask;
 import org.whispersystems.textsecuregcm.workers.SetUserDiscoverabilityCommand;
 import org.whispersystems.textsecuregcm.workers.UnlinkDeviceCommand;
@@ -569,8 +568,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     AccountDatabaseCrawler accountCleanerAccountDatabaseCrawler = new AccountDatabaseCrawler("Account cleaner crawler",
         accountsManager,
         accountCleanerAccountDatabaseCrawlerCache, List.of(new AccountCleaner(accountsManager, accountDeletionExecutor)),
-        config.getAccountDatabaseCrawlerConfiguration().getChunkSize(),
-        config.getAccountDatabaseCrawlerConfiguration().getChunkIntervalMs()
+        config.getAccountDatabaseCrawlerConfiguration().getChunkSize()
     );
 
     // TODO listeners must be ordered so that ones that directly update accounts come last, so that read-only ones are not working with stale data
@@ -585,8 +583,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     AccountDatabaseCrawler accountDatabaseCrawler = new AccountDatabaseCrawler("General-purpose account crawler",
         accountsManager,
         accountDatabaseCrawlerCache, accountDatabaseCrawlerListeners,
-        config.getAccountDatabaseCrawlerConfiguration().getChunkSize(),
-        config.getAccountDatabaseCrawlerConfiguration().getChunkIntervalMs()
+        config.getAccountDatabaseCrawlerConfiguration().getChunkSize()
     );
 
     HttpClient currencyClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_2).connectTimeout(Duration.ofSeconds(10)).build();
@@ -794,7 +791,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     provisioning.setAsyncSupported(true);
 
     environment.admin().addTask(new SetRequestLoggingEnabledTask());
-    environment.admin().addTask(new SetCrawlerAccelerationTask(accountDatabaseCrawlerCache));
 
     environment.healthChecks().register("cacheCluster", new RedisClusterHealthCheck(cacheCluster));
 

service/src/main/java/org/whispersystems/textsecuregcm/configuration/AccountDatabaseCrawlerConfiguration.java

@@ -11,14 +11,8 @@ public class AccountDatabaseCrawlerConfiguration {
   @JsonProperty
   private int chunkSize = 1000;
 
-  @JsonProperty
-  private long chunkIntervalMs = 8000L;
-
   public int getChunkSize() {
     return chunkSize;
   }
 
-  public long getChunkIntervalMs() {
-    return chunkIntervalMs;
-  }
 }

service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawler.java

@@ -11,6 +11,7 @@ import com.codahale.metrics.SharedMetricRegistries;
 import com.codahale.metrics.Timer;
 import com.google.common.annotations.VisibleForTesting;
 import io.dropwizard.lifecycle.Managed;
+import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -30,12 +31,11 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
       name(AccountDatabaseCrawler.class, "processChunk"));
 
   private static final long WORKER_TTL_MS = 120_000L;
-  private static final long ACCELERATED_CHUNK_INTERVAL = 10L;
+  private static final long CHUNK_INTERVAL_MILLIS = Duration.ofSeconds(2).toMillis();
 
   private final String name;
   private final AccountsManager accounts;
   private final int chunkSize;
-  private final long chunkIntervalMs;
   private final String workerId;
   private final AccountDatabaseCrawlerCache cache;
   private final List<AccountDatabaseCrawlerListener> listeners;
@@ -47,12 +47,10 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
       AccountsManager accounts,
       AccountDatabaseCrawlerCache cache,
       List<AccountDatabaseCrawlerListener> listeners,
-      int chunkSize,
-      long chunkIntervalMs) {
+      int chunkSize) {
     this.name = name;
     this.accounts = accounts;
     this.chunkSize = chunkSize;
-    this.chunkIntervalMs = chunkIntervalMs;
     this.workerId = UUID.randomUUID().toString();
     this.cache = cache;
     this.listeners = listeners;
@@ -76,12 +74,11 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
 
   @Override
   public void run() {
-    boolean accelerated = false;
 
     while (running.get()) {
       try {
-        accelerated = doPeriodicWork();
-        sleepWhileRunning(accelerated ? ACCELERATED_CHUNK_INTERVAL : chunkIntervalMs);
+        doPeriodicWork();
+        sleepWhileRunning(CHUNK_INTERVAL_MILLIS);
       } catch (Throwable t) {
         logger.warn("{}: error in database crawl: {}: {}", name, t.getClass().getSimpleName(), t.getMessage(), t);
         Util.sleep(10000);
@@ -95,26 +92,14 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
   }
 
   @VisibleForTesting
-  public boolean doPeriodicWork() {
+  public void doPeriodicWork() {
     if (cache.claimActiveWork(workerId, WORKER_TTL_MS)) {
-
       try {
-        final long startTimeMs = System.currentTimeMillis();
         processChunk();
-        if (cache.isAccelerated()) {
-          return true;
-        }
-        final long endTimeMs = System.currentTimeMillis();
-        final long sleepIntervalMs = chunkIntervalMs - (endTimeMs - startTimeMs);
-        if (sleepIntervalMs > 0) {
-          logger.debug("{}: Sleeping {}ms", name, sleepIntervalMs);
-          sleepWhileRunning(sleepIntervalMs);
-        }
       } finally {
         cache.releaseActiveWork(workerId);
       }
     }
-    return false;
   }
 
   private void processChunk() {
@@ -134,7 +119,6 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
         logger.info("{}: Finished crawl", name);
         listeners.forEach(listener -> listener.onCrawlEnd(fromUuid));
         cacheLastUuid(Optional.empty());
-        cache.setAccelerated(false);
       } else {
         logger.debug("{}: Processing chunk", name);
         try {
@@ -144,7 +128,6 @@ public class AccountDatabaseCrawler implements Managed, Runnable {
           cacheLastUuid(chunkAccounts.getLastUuid());
         } catch (AccountDatabaseCrawlerRestartException e) {
           cacheLastUuid(Optional.empty());
-          cache.setAccelerated(false);
         }
       }
     }

service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountDatabaseCrawlerCache.java

@@ -20,8 +20,6 @@ public class AccountDatabaseCrawlerCache {
   public static final String ACCOUNT_CLEANER_PREFIX = "account-cleaner";
 
   private static final String ACTIVE_WORKER_KEY = "account_database_crawler_cache_active_worker";
-  private static final String ACCELERATE_KEY = "account_database_crawler_cache_accelerate";
-
   private static final String LAST_UUID_DYNAMO_KEY = "account_database_crawler_cache_last_uuid_dynamo";
 
   private static final long LAST_NUMBER_TTL_MS = 86400_000L;
@@ -39,18 +37,6 @@ public class AccountDatabaseCrawlerCache {
     this.prefix = prefix + "::";
   }
 
-  public void setAccelerated(final boolean accelerated) {
-    if (accelerated) {
-      cacheCluster.useCluster(connection -> connection.sync().set(getPrefixedKey(ACCELERATE_KEY), "1"));
-    } else {
-      cacheCluster.useCluster(connection -> connection.sync().del(getPrefixedKey(ACCELERATE_KEY)));
-    }
-  }
-
-  public boolean isAccelerated() {
-    return "1".equals(cacheCluster.withCluster(connection -> connection.sync().get(ACCELERATE_KEY)));
-  }
-
   public boolean claimActiveWork(String workerId, long ttlMs) {
     return "OK".equals(cacheCluster.withCluster(connection -> connection.sync()
         .set(getPrefixedKey(ACTIVE_WORKER_KEY), workerId, SetArgs.Builder.nx().px(ttlMs))));

service/src/main/java/org/whispersystems/textsecuregcm/workers/SetCrawlerAccelerationTask.java

@@ -1,36 +0,0 @@
-/*
- * 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]");
-        }
-    }
-}