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

[dlmarion]

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

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

commit 85418b8f5e681c5a7091150f24975e8630be9804
Merge: 3258c83cfb fde696ea4d
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Tue Aug 27 12:35:12 2024 +0000

    Merge branch '3.1'

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

diff --cc 
server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index d0e76b5286,893a629ccf..cef4622af5
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@@ -384,10 -350,11 +384,10 @@@ public class SimpleGarbageCollector ext
      };
  
      UUID zooLockUUID = UUID.randomUUID();
 -    ServiceLock lock =
 -        new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), 
path, zooLockUUID);
++    gcLock = new 
ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), path, 
zooLockUUID);
      while (true) {
-       gcLock = new 
ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), path, 
zooLockUUID);
 -      if (lock.tryLock(lockWatcher,
 -          new ServiceLockData(zooLockUUID, addr.toString(), 
ThriftService.GC))) {
 +      if (gcLock.tryLock(lockWatcher, new ServiceLockData(zooLockUUID, 
addr.toString(),
 +          ThriftService.GC, this.getResourceGroup()))) {
          log.debug("Got GC ZooKeeper lock");
          return;
        }
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index e3b99b1615,2c1539e553..a88eb56b99
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@@ -1532,12 -1614,10 +1532,15 @@@ public class Manager extends AbstractSe
          getHostname() + ":" + 
getConfiguration().getPort(Property.MANAGER_CLIENTPORT)[0];
  
      UUID zooLockUUID = UUID.randomUUID();
 -    ServiceLockData sld =
 -        new ServiceLockData(zooLockUUID, managerClientAddress, 
ThriftService.MANAGER);
 +
 +    ServiceDescriptors descriptors = new ServiceDescriptors();
 +    descriptors.addService(new ServiceDescriptor(zooLockUUID, 
ThriftService.MANAGER,
 +        managerClientAddress, this.getResourceGroup()));
 +
 +    ServiceLockData sld = new ServiceLockData(descriptors);
+ 
+     managerLock = new ServiceLock(zooKeeper, zManagerLoc, zooLockUUID);
++
      while (true) {
  
        ManagerLockWatcher managerLockWatcher = new ManagerLockWatcher();
diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 39ac86c96c,5a1f81a30b..89f90ead12
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -829,13 -831,12 +829,15 @@@ 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 ServiceLockData(zooLockUUID,
 -          monitorLocation.getHost() + ":" + monitorLocation.getPort(), 
ThriftService.NONE));
++
 +      monitorLock.lock(monitorLockWatcher,
 +          new ServiceLockData(zooLockUUID,
 +              monitorLocation.getHost() + ":" + monitorLocation.getPort(), 
ThriftService.NONE,
 +              this.getResourceGroup()));
  
        monitorLockWatcher.waitForChange();