Merge branch '2.1' into 3.1

dlmarion · Jan 6, 2025 · 0553feb · 0553feb
2 parents 81c7f3d + ae85003
commit 0553feb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -336,9 +336,9 @@ private void getZooLock(HostAndPort addr) throws KeeperException, InterruptedExc
 
     UUID zooLockUUID = UUID.randomUUID();
     gcLock = new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), path, zooLockUUID);
+    HAServiceLockWatcher gcLockWatcher = new HAServiceLockWatcher("gc");
 
     while (true) {
-      HAServiceLockWatcher gcLockWatcher = new HAServiceLockWatcher("gc");
       gcLock.lock(gcLockWatcher,
           new ServiceLockData(zooLockUUID, addr.toString(), ThriftService.GC));