From 74ff491671d149ecd4121850a87403c1a2d8ef6e Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Thu, 24 Jun 2021 17:10:46 -0500
Subject: [PATCH] Rename ManagedPeriodicWorkCache to ManagedPeriodicWorkLock

---
 .../storage/DeletedAccountsTableCrawler.java           |  2 +-
 .../textsecuregcm/storage/ManagedPeriodicWork.java     | 10 +++++-----
 ...odicWorkCache.java => ManagedPeriodicWorkLock.java} |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename service/src/main/java/org/whispersystems/textsecuregcm/storage/{ManagedPeriodicWorkCache.java => ManagedPeriodicWorkLock.java} (87%)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsTableCrawler.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsTableCrawler.java
index 9019790bd..67671f5f2 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsTableCrawler.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsTableCrawler.java
@@ -34,7 +34,7 @@ public class DeletedAccountsTableCrawler extends ManagedPeriodicWork {
       final List<DeletedAccountsDirectoryReconciler> reconcilers,
       final FaultTolerantRedisCluster cluster) throws IOException {
 
-    super(new ManagedPeriodicWorkCache(ACTIVE_WORKER_KEY, cluster), WORKER_TTL, RUN_INTERVAL);
+    super(new ManagedPeriodicWorkLock(ACTIVE_WORKER_KEY, cluster), WORKER_TTL, RUN_INTERVAL);
 
     this.deletedAccounts = deletedAccounts;
     this.reconcilers = reconcilers;
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java
index 6fb0c6128..913e74f83 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java
@@ -16,7 +16,7 @@ public abstract class ManagedPeriodicWork implements Managed, Runnable {
 
   private final Logger logger = LoggerFactory.getLogger(getClass());
 
-  private final ManagedPeriodicWorkCache cache;
+  private final ManagedPeriodicWorkLock lock;
   private final Duration workerTtl;
   private final Duration runInterval;
   private final String workerId;
@@ -24,8 +24,8 @@ public abstract class ManagedPeriodicWork implements Managed, Runnable {
   private final AtomicBoolean running = new AtomicBoolean(false);
   private boolean finished;
 
-  public ManagedPeriodicWork(final ManagedPeriodicWorkCache cache, final Duration workerTtl, final Duration runInterval) {
-    this.cache = cache;
+  public ManagedPeriodicWork(final ManagedPeriodicWorkLock lock, final Duration workerTtl, final Duration runInterval) {
+    this.lock = lock;
     this.workerTtl = workerTtl;
     this.runInterval = runInterval;
     this.workerId = UUID.randomUUID().toString();
@@ -73,7 +73,7 @@ public abstract class ManagedPeriodicWork implements Managed, Runnable {
 
   private void execute() {
 
-    if (cache.claimActiveWork(workerId, workerTtl)) {
+    if (lock.claimActiveWork(workerId, workerTtl)) {
 
       try {
         final long startTimeMs = System.currentTimeMillis();
@@ -96,7 +96,7 @@ public abstract class ManagedPeriodicWork implements Managed, Runnable {
         sleepWhileRunning(runInterval);
 
       } finally {
-        cache.releaseActiveWork(workerId);
+        lock.releaseActiveWork(workerId);
       }
     }
   }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWorkCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWorkLock.java
similarity index 87%
rename from service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWorkCache.java
rename to service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWorkLock.java
index c1fd10ed3..5ccbfae10 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWorkCache.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWorkLock.java
@@ -12,14 +12,14 @@ import java.io.IOException;
 import java.time.Duration;
 import java.util.List;
 
-public class ManagedPeriodicWorkCache {
+public class ManagedPeriodicWorkLock {
 
   private final String activeWorkerKey;
 
   private final FaultTolerantRedisCluster cacheCluster;
   private final ClusterLuaScript unlockClusterScript;
 
-  public ManagedPeriodicWorkCache(final String activeWorkerKey, final FaultTolerantRedisCluster cacheCluster) throws IOException {
+  public ManagedPeriodicWorkLock(final String activeWorkerKey, final FaultTolerantRedisCluster cacheCluster) throws IOException {
     this.activeWorkerKey = activeWorkerKey;
     this.cacheCluster = cacheCluster;
     this.unlockClusterScript = ClusterLuaScript.fromResource(cacheCluster, "lua/periodic_worker/unlock.lua", ScriptOutputType.INTEGER);