(accumulo) 01/01: Merge branch '2.1' into 3.1, fix test, remove unused var

[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 7d1a816791c7b83c75e367fda38d9e23603ffa96
Merge: 9c10eca61d 25dcfbfe14
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Jan 8 20:22:14 2025 +0000

    Merge branch '2.1' into 3.1, fix test, remove unused var

 .../accumulo/core/classloader/ClassLoaderUtil.java |   2 +-
 .../accumulo/server/conf/util/ZooInfoViewer.java   |   2 -
 .../org/apache/accumulo/server/util/PropUtil.java  |  19 ++--
 .../accumulo/server/util/SystemPropUtil.java       |  11 ++-
 .../server/conf/util/ZooInfoViewerTest.java        |   5 +-
 .../apache/accumulo/server/util/PropUtilTest.java  | 102 +++++++++++++++++++++
 6 files changed, 121 insertions(+), 20 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooInfoViewer.java
index 61b9ca2aa4,c6763e8596..5acc0bbc51
--- 
a/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooInfoViewer.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooInfoViewer.java
@@@ -113,10 -115,8 +113,8 @@@ public class ZooInfoViewer implements K
      log.info("print properties: {}", opts.printProps);
      log.info("print instances: {}", opts.printInstanceIds);
  
-     var conf = opts.getSiteConfiguration();
- 
      try (ServerContext context = getContext(opts)) {
 -      generateReport(context.getInstanceID(), opts, context.getZooReader());
 +      generateReport(context, opts);
      }
    }
  
diff --cc 
server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooInfoViewerTest.java
index f0d0a44600,d9113506da..eddd467210
--- 
a/server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooInfoViewerTest.java
+++ 
b/server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooInfoViewerTest.java
@@@ -148,10 -153,13 +148,9 @@@ public class ZooInfoViewerTest 
  
      String testFileName = "./target/zoo-info-viewer-" + 
System.currentTimeMillis() + ".txt";
  
 -    ServerContext context =
 -        MockServerContext.getWithZK(InstanceId.of(instanceName), 
instanceName, 20_000);
--    expect(context.getZooReader()).andReturn(zooReader).once();
      context.close();
  
 -    replay(context);
 +    replay(context, zooReader);
  
      class ZooInfoViewerTestClazz extends ZooInfoViewer {
        @Override
@@@ -295,15 -295,26 +294,13 @@@
      expect(zooReader.getData(tBasePath + "/t" + ZTABLE_NAMESPACE))
          .andReturn("+default".getBytes(UTF_8)).anyTimes();
  
-     replay(context, zooReader);
 -    replay(zooReader);
--
      NamespacePropKey nsKey = NamespacePropKey.of(iid, nsId);
      log.trace("namespace base path: {}", nsKey.getPath());
  
      String testFileName = "./target/zoo-info-viewer-" + 
System.currentTimeMillis() + ".txt";
 -
 -    ZooReaderWriter zrw = createMock(ZooReaderWriter.class);
 -    expect(zrw.getSessionTimeout()).andReturn(2_000).anyTimes();
 -    expect(zrw.exists(eq("/accumulo/" + iid), 
anyObject())).andReturn(true).anyTimes();
 -
 -    replay(zrw);
 -
 -    PropStore propStore = ZooPropStore.initialize(iid, zrw);
 -
 -    ServerContext context = 
MockServerContext.getMockContextWithPropStore(iid, zrw, propStore);
 -    expect(context.getZooReader()).andReturn(zooReader).once();
      context.close();
  
--    replay(context);
++    replay(context, zooReader);
  
      class ZooInfoViewerTestClazz extends ZooInfoViewer {
        @Override