(accumulo) 02/02: Merge branch 'main' into elasticity

[ctubbsii]

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

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

commit 199b054f060eaf44b5ffcea7d4b5ab8ad246ca32
Merge: 4721ad5eef b701918ec0
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Fri Jan 26 12:58:14 2024 -0500

    Merge branch 'main' into elasticity

 .github/workflows/maven-full-its.yaml              |  4 ++--
 .github/workflows/maven-on-demand.yaml             |  2 +-
 .github/workflows/maven.yaml                       |  4 ++--
 .../core/clientImpl/InstanceOperationsImpl.java    |  3 +--
 .../apache/accumulo/core/lock/ServiceLockData.java |  2 +-
 .../accumulo/core/metadata/TServerInstance.java    |  4 ++--
 .../org/apache/accumulo/core/util/AddressUtil.java | 18 +++++++++------
 .../apache/accumulo/core/util/AddressUtilTest.java | 26 ++++++++++++++++++++++
 .../MiniAccumuloClusterImplTest.java               |  3 ++-
 .../accumulo/server/manager/LiveTServerSet.java    |  4 ++--
 .../monitor/rest/manager/ManagerResource.java      |  2 +-
 .../rest/tservers/TabletServerResource.java        |  2 +-
 12 files changed, 52 insertions(+), 22 deletions(-)

diff --cc 
minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java
index 8934929b2f,c8cf747fe9..9007b03b0c
--- 
a/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java
+++ 
b/minicluster/src/test/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImplTest.java
@@@ -106,9 -106,10 +106,10 @@@ public class MiniAccumuloClusterImplTes
    @Timeout(60)
    public void saneMonitorInfo() throws Exception {
      ManagerMonitorInfo stats;
 -    int expectedNumTables = 3;
++    int expectedNumTables = 4;
      while (true) {
        stats = accumulo.getManagerMonitorInfo();
-       if (stats.tableMap.size() <= 2) {
+       if (stats.tableMap.size() < expectedNumTables) {
          continue;
        }