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

[ddanielr]

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

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

commit 2cab1465299603ec97a3372a3ec9f9ef3a17779b
Merge: 00da7799ae 99af30f283
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Sun Jul 28 19:39:09 2024 +0000

    Merge branch '2.1'

 .../accumulo/core/metrics/MetricsProducer.java     | 10 +++++
 .../java/org/apache/accumulo/manager/Manager.java  |  8 ++++
 .../accumulo/manager/metrics/BalancerMetrics.java  | 51 ++++++++++++++++++++++
 .../java/org/apache/accumulo/test/BalanceIT.java   | 18 ++++++++
 .../BalanceInPresenceOfOfflineTableIT.java         |  2 +
 .../apache/accumulo/test/metrics/MetricsIT.java    |  5 ++-
 6 files changed, 92 insertions(+), 2 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
index ee6eb6e891,84bf20b16c..f742ac460b
--- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java
@@@ -693,9 -715,9 +701,11 @@@ public interface MetricsProducer 
    String METRICS_BLOCKCACHE_SUMMARY_HITCOUNT = METRICS_BLOCKCACHE_PREFIX + 
"summary.hitcount";
    String METRICS_BLOCKCACHE_SUMMARY_REQUESTCOUNT =
        METRICS_BLOCKCACHE_PREFIX + "summary.requestcount";
 +  String METRICS_BLOCKCACHE_SUMMARY_EVICTIONCOUNT =
 +      METRICS_BLOCKCACHE_PREFIX + "summary.evictioncount";
  
+   String METRICS_MANAGER_BALANCER_MIGRATIONS_NEEDED = 
"accumulo.manager.balancer.migrations.needed";
+ 
    /**
     * Build Micrometer Meter objects and register them with the registry
     */
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 1d71c17614,a72485af01..a7fb4a3a9d
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@@ -111,8 -109,7 +111,9 @@@ import org.apache.accumulo.core.util.Ha
  import org.apache.accumulo.core.util.Retry;
  import org.apache.accumulo.core.util.threads.ThreadPools;
  import org.apache.accumulo.core.util.threads.Threads;
 +import org.apache.accumulo.core.util.time.NanoTime;
 +import org.apache.accumulo.core.util.time.SteadyTime;
+ import org.apache.accumulo.manager.metrics.BalancerMetrics;
  import org.apache.accumulo.manager.metrics.ManagerMetrics;
  import org.apache.accumulo.manager.recovery.RecoveryManager;
  import org.apache.accumulo.manager.state.TableCounts;