(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 47b90510d8b3987b9991fde5fd80b4a97072570c
Merge: 1b791e26b4 c92c2246a7
Author: Dom Garguilo <domgargu...@apache.org>
AuthorDate: Fri Oct 31 14:05:10 2025 -0400

    Merge remote-tracking branch 'upstream/2.1'

 .../apache/accumulo/test/compaction/ClassLoaderContextCompactionIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/compaction/ClassLoaderContextCompactionIT.java
index 18b5c1cdf1,f71e509945..21f675a6a5
--- 
a/test/src/main/java/org/apache/accumulo/test/compaction/ClassLoaderContextCompactionIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/compaction/ClassLoaderContextCompactionIT.java
@@@ -128,41 -122,26 +128,41 @@@ public class ClassLoaderContextCompacti
            if (shutdownTailer.get()) {
              break;
            }
 -          if 
(s.startsWith(MetricsProducer.METRICS_COMPACTOR_COMPACTIONS_CANCELLED)) {
 +          if (s.startsWith(COMPACTOR_MAJC_CANCELLED.getName())) {
              Metric m = TestStatsDSink.parseStatsDMetric(s);
 -            LOG.info("{}", m);
 -            cancellations.set(Long.parseLong(m.getValue()));
 -          } else if 
(s.startsWith(MetricsProducer.METRICS_COMPACTOR_COMPACTIONS_COMPLETED)) {
 +            if (m.getTags().containsKey("resource.group")
 +                && m.getTags().get("resource.group").equals(GROUP1)) {
 +              LOG.info("{}", m);
 +              cancellations.set(Long.parseLong(m.getValue()));
 +            }
 +          } else if (s.startsWith(COMPACTOR_MAJC_COMPLETED.getName())) {
              Metric m = TestStatsDSink.parseStatsDMetric(s);
 -            LOG.info("{}", m);
 -            completions.set(Long.parseLong(m.getValue()));
 -          } else if 
(s.startsWith(MetricsProducer.METRICS_COMPACTOR_COMPACTIONS_FAILED)) {
 +            if (m.getTags().containsKey("resource.group")
 +                && m.getTags().get("resource.group").equals(GROUP1)) {
 +              LOG.info("{}", m);
 +              completions.set(Long.parseLong(m.getValue()));
 +            }
 +          } else if (s.startsWith(COMPACTOR_MAJC_FAILED.getName())) {
              Metric m = TestStatsDSink.parseStatsDMetric(s);
 -            LOG.info("{}", m);
 -            failures.set(Long.parseLong(m.getValue()));
 -          } else if 
(s.startsWith(MetricsProducer.METRICS_COMPACTOR_FAILURES_TERMINATION)) {
 +            if (m.getTags().containsKey("resource.group")
 +                && m.getTags().get("resource.group").equals(GROUP1)) {
 +              LOG.info("{}", m);
 +              failures.set(Long.parseLong(m.getValue()));
 +            }
 +          } else if 
(s.startsWith(COMPACTOR_MAJC_FAILURES_TERMINATION.getName())) {
              Metric m = TestStatsDSink.parseStatsDMetric(s);
 -            LOG.info("{}", m);
 -            terminations.set(Long.parseLong(m.getValue()));
 -          } else if 
(s.startsWith(MetricsProducer.METRICS_COMPACTOR_FAILURES_CONSECUTIVE)) {
 +            if (m.getTags().containsKey("resource.group")
 +                && m.getTags().get("resource.group").equals(GROUP1)) {
 +              LOG.info("{}", m);
 +              terminations.set(Long.parseLong(m.getValue()));
 +            }
 +          } else if 
(s.startsWith(COMPACTOR_MAJC_FAILURES_CONSECUTIVE.getName())) {
              Metric m = TestStatsDSink.parseStatsDMetric(s);
 -            LOG.info("{}", m);
 -            consecutive.getAndUpdate(prev -> Math.max(prev, 
Long.parseLong(m.getValue())));
 +            if (m.getTags().containsKey("resource.group")
 +                && m.getTags().get("resource.group").equals(GROUP1)) {
 +              LOG.info("{}", m);
-               consecutive.set(Long.parseLong(m.getValue()));
++              consecutive.getAndUpdate(prev -> Math.max(prev, 
Long.parseLong(m.getValue())));
 +            }
            }
  
          }