You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by do...@apache.org on 2024/06/10 14:19:47 UTC

(accumulo) branch main updated (5256e3462d -> 18207ee064)

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

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


    from 5256e3462d fixes PrintInfoIT (#4658)
     add 2155852b3a Add new compactor busy metric to unexpected list - fixes MetricsIT failure (#4648)
     new 18207ee064 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 do...@apache.org.
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 <do...@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,