(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 428f7c794dc51a4e6641405f108318e38026b127
Merge: ea5e68a006 33ad3f1108
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Jan 17 18:49:31 2025 +0000

    Merge branch '3.1'

 .../org/apache/accumulo/server/util/ListInstances.java     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
index e65a5e02a6,89f4abed2c..76a37505fa
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
@@@ -171,9 -168,8 +169,9 @@@ public class ListInstances 
      }
  
      try {
 -      var zLockManagerPath = ServiceLock.path(ZooUtil.getRoot(iid) + 
Constants.ZMANAGER_LOCK);
 +      var zLockManagerPath = 
ServiceLockPaths.parse(Optional.of(Constants.ZMANAGER_LOCK),
 +          ZooUtil.getRoot(iid) + Constants.ZMANAGER_LOCK);
-       Optional<ServiceLockData> sld = ServiceLock.getLockData(cache, 
zLockManagerPath, null);
+       Optional<ServiceLockData> sld = ServiceLock.getLockData(zs, 
zLockManagerPath);
        if (sld.isEmpty()) {
          return null;
        }