(accumulo) 01/01: Merge remote-tracking branch 'upstream/2.1'

[domgarguilo]

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

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

commit 18207ee064331b05d7b40f0f08a8b74d9a454885
Merge: 5256e3462d 2155852b3a
Author: Dom Garguilo <domgargu...@apache.org>
AuthorDate: Mon Jun 10 10:06:32 2024 -0400

    Merge remote-tracking branch 'upstream/2.1'
    
    # Conflicts:
    #       test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java

 test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --cc test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
index 36c55f4d1a,5a46507db1..2a26f6eb16
--- a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
@@@ -100,8 -100,12 +100,10 @@@ public class MetricsIT extends Configur
      cluster.stop();
      // meter names sorted and formatting disabled to make it easier to diff 
changes
      // @formatter:off
-     Set<String> unexpectedMetrics = Set.of(METRICS_COMPACTOR_MAJC_STUCK,
+     Set<String> unexpectedMetrics =
+             Set.of(METRICS_COMPACTOR_MAJC_STUCK,
+                     METRICS_COMPACTOR_BUSY,
 -                    METRICS_REPLICATION_QUEUE,
 -                    METRICS_SCAN_YIELDS,
 -                    METRICS_UPDATE_ERRORS);
 +                    METRICS_SCAN_YIELDS);
  
      // add sserver as flaky until scan server included in mini tests.
      Set<String> flakyMetrics = Set.of(METRICS_FATE_TYPE_IN_PROGRESS,