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

[edcoleman]

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

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

commit 6ab37857263c6baab3806b9dc5921c8bbeff7780
Merge: 4a5d8da7a5 5e48ff92fb
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Fri May 24 16:00:29 2024 +0000

    Merge remote-tracking branch 'upstream/2.1'

 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 0b76970d6d,5d9c833be5..7667f84207
--- a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
@@@ -99,9 -99,12 +99,11 @@@ public class MetricsIT extends Configur
      doWorkToGenerateMetrics();
      cluster.stop();
  
 -    Set<String> unexpectedMetrics = Set.of(METRICS_SCAN_YIELDS, 
METRICS_UPDATE_ERRORS,
 -        METRICS_REPLICATION_QUEUE, METRICS_COMPACTOR_MAJC_STUCK, 
METRICS_SCAN_BUSY_TIMEOUT_COUNTER);
 +    Set<String> unexpectedMetrics = Set.of(METRICS_COMPACTOR_MAJC_STUCK, 
METRICS_SCAN_YIELDS);
+     // add sserver as flaky until scan server included in mini tests.
 -    Set<String> flakyMetrics = Set.of(METRICS_GC_WAL_ERRORS, 
METRICS_FATE_TYPE_IN_PROGRESS,
 -        METRICS_SCAN_BUSY_TIMEOUT_COUNTER, 
METRICS_SCAN_RESERVATION_TOTAL_TIMER,
 -        METRICS_SCAN_RESERVATION_WRITEOUT_TIMER, 
METRICS_SCAN_RESERVATION_CONFLICT_COUNTER,
 +    Set<String> flakyMetrics = Set.of(METRICS_FATE_TYPE_IN_PROGRESS, 
METRICS_GC_WAL_ERRORS,
-         METRICS_SCAN_RESERVATION_TOTAL_TIMER, 
METRICS_SCAN_BUSY_TIMEOUT_COUNTER,
++        METRICS_SCAN_BUSY_TIMEOUT_COUNTER, 
METRICS_SCAN_RESERVATION_CONFLICT_COUNTER,
++        METRICS_SCAN_RESERVATION_TOTAL_TIMER, 
METRICS_SCAN_RESERVATION_WRITEOUT_TIMER,
          METRICS_SCAN_TABLET_METADATA_CACHE);
  
      Map<String,String> expectedMetricNames = this.getMetricFields();