(accumulo) 01/01: Merge branch '2.1' into 3.1

[dlmarion]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 0553feb4c7a6ddacfc6cc356b95d0600c5ddec27
Merge: 81c7f3db48 ae8500331a
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Jan 6 19:40:38 2025 +0000

    Merge branch '2.1' into 3.1

 .../gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc 
server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index adc15bea23,8ea304a8fd..ab5cc89df2
--- 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,11 -365,11 +336,11 @@@ public class SimpleGarbageCollector ext
  
      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 ServerServices(addr.toString(), 
Service.GC_CLIENT).toString().getBytes(UTF_8));
 +          new ServiceLockData(zooLockUUID, addr.toString(), 
ThriftService.GC));
  
        gcLockWatcher.waitForChange();