(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 fde696ea4dbfa08959593af797ae626a7f1e9108
Merge: 5b4c1f5e0e b935a7b43e
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Tue Aug 27 12:14:34 2024 +0000

    Merge branch '2.1' into 3.1

 .../java/org/apache/accumulo/coordinator/CompactionCoordinator.java   | 4 ++--
 .../src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java  | 4 ++--
 server/manager/src/main/java/org/apache/accumulo/manager/Manager.java | 3 ++-
 server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --cc 
server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
index c34f55b1e9,37039adf68..49b95ae34d
--- 
a/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
+++ 
b/server/compaction-coordinator/src/main/java/org/apache/accumulo/coordinator/CompactionCoordinator.java
@@@ -215,10 -221,7 +217,8 @@@ public class CompactionCoordinator exte
      while (true) {
  
        CoordinatorLockWatcher coordinatorLockWatcher = new 
CoordinatorLockWatcher();
-       coordinatorLock = new 
ServiceLock(getContext().getZooReaderWriter().getZooKeeper(),
-           ServiceLock.path(lockPath), zooLockUUID);
 -      coordinatorLock.lock(coordinatorLockWatcher, 
coordinatorClientAddress.getBytes(UTF_8));
 +      coordinatorLock.lock(coordinatorLockWatcher,
 +          new ServiceLockData(zooLockUUID, coordinatorClientAddress, 
ThriftService.COORDINATOR));
  
        coordinatorLockWatcher.waitForChange();
        if (coordinatorLockWatcher.isAcquiredLock()) {
diff --cc 
server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 7537ebd44e,153cf698a2..893a629ccf
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@@ -350,11 -379,11 +350,11 @@@ public class SimpleGarbageCollector ext
      };
  
      UUID zooLockUUID = UUID.randomUUID();
+     ServiceLock lock =
+         new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), 
path, zooLockUUID);
      while (true) {
-       ServiceLock lock =
-           new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), 
path, zooLockUUID);
        if (lock.tryLock(lockWatcher,
 -          new ServerServices(addr.toString(), 
Service.GC_CLIENT).toString().getBytes(UTF_8))) {
 +          new ServiceLockData(zooLockUUID, addr.toString(), 
ThriftService.GC))) {
          log.debug("Got GC ZooKeeper lock");
          return;
        }
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 96f312d570,77c9da57ae..2c1539e553
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@@ -1614,13 -1677,11 +1614,14 @@@ public class Manager extends AbstractSe
          getHostname() + ":" + 
getConfiguration().getPort(Property.MANAGER_CLIENTPORT)[0];
  
      UUID zooLockUUID = UUID.randomUUID();
 +    ServiceLockData sld =
 +        new ServiceLockData(zooLockUUID, managerClientAddress, 
ThriftService.MANAGER);
++
+     managerLock = new ServiceLock(zooKeeper, zManagerLoc, zooLockUUID);
      while (true) {
  
        ManagerLockWatcher managerLockWatcher = new ManagerLockWatcher();
-       managerLock = new ServiceLock(zooKeeper, zManagerLoc, zooLockUUID);
 -      managerLock.lock(managerLockWatcher, 
managerClientAddress.getBytes(UTF_8));
 +      managerLock.lock(managerLockWatcher, sld);
  
        managerLockWatcher.waitForChange();
  
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 2740a2049f,bc57f62ff7..5a1f81a30b
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -831,11 -829,11 +831,12 @@@ public class Monitor extends AbstractSe
  
      // Get a ZooLock for the monitor
      UUID zooLockUUID = UUID.randomUUID();
+     monitorLock = new ServiceLock(zoo.getZooKeeper(), monitorLockPath, 
zooLockUUID);
+ 
      while (true) {
        MoniterLockWatcher monitorLockWatcher = new MoniterLockWatcher();
-       monitorLock = new ServiceLock(zoo.getZooKeeper(), monitorLockPath, 
zooLockUUID);
 -      monitorLock.lock(monitorLockWatcher, new byte[0]);
 +      monitorLock.lock(monitorLockWatcher, new ServiceLockData(zooLockUUID,
 +          monitorLocation.getHost() + ":" + monitorLocation.getPort(), 
ThriftService.NONE));
  
        monitorLockWatcher.waitForChange();