You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ed...@apache.org on 2024/05/24 16:01:36 UTC

(accumulo) branch main updated (4a5d8da7a5 -> 6ab3785726)

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

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


    from 4a5d8da7a5 Use NanoTime to measure reservation time for scan server metrics
     add 5e48ff92fb Add new scan metrics to flaky list in MetricsIT (#4601)
     new 6ab3785726 Merge remote-tracking branch 'upstream/2.1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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


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

Posted by ed...@apache.org.
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 <ed...@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();