(accumulo) branch elasticity updated: Fix some failing ITs, increase timeouts and reclassifiy metrics (#3916)

[dlmarion]

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

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


The following commit(s) were added to refs/heads/elasticity by this push:
     new 7fe3cfd934 Fix some failing ITs, increase timeouts and reclassifiy 
metrics (#3916)
7fe3cfd934 is described below

commit 7fe3cfd9342a7f5c772ebe237edc9fdf562dfa36
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Nov 1 09:19:06 2023 -0400

    Fix some failing ITs, increase timeouts and reclassifiy metrics (#3916)
---
 .../apache/accumulo/test/functional/DeletedTablesDontFlushIT.java  | 2 +-
 test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
 
b/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
index 5c04cde646..89818a0ed7 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/DeletedTablesDontFlushIT.java
@@ -39,7 +39,7 @@ public class DeletedTablesDontFlushIT extends 
SharedMiniClusterBase {
 
   @Override
   protected Duration defaultTimeout() {
-    return Duration.ofMinutes(1);
+    return Duration.ofMinutes(2);
   }
 
   @BeforeAll
diff --git a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java 
b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
index 6aea6afa01..80bcb2b84c 100644
--- a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
@@ -96,14 +96,13 @@ public class MetricsIT extends ConfigurableMacBase 
implements MetricsProducer {
 
     Set<String> unexpectedMetrics = Set.of(METRICS_SCAN_YIELDS, 
METRICS_UPDATE_ERRORS,
         METRICS_SCAN_BUSY_TIMEOUT, METRICS_SCAN_PAUSED_FOR_MEM, 
METRICS_SCAN_RETURN_FOR_MEM,
-        METRICS_MINC_PAUSED, METRICS_MAJC_PAUSED, METRICS_MAJC_QUEUED, 
METRICS_MAJC_RUNNING,
-        METRICS_MANAGER_ROOT_TGW_ERRORS, METRICS_MANAGER_META_TGW_ERRORS,
-        METRICS_MANAGER_USER_TGW_ERRORS);
+        METRICS_MINC_PAUSED, METRICS_MAJC_PAUSED, METRICS_MAJC_QUEUED, 
METRICS_MAJC_RUNNING);
     Set<String> flakyMetrics = Set.of(METRICS_GC_WAL_ERRORS, 
METRICS_FATE_TYPE_IN_PROGRESS,
         METRICS_PROPSTORE_EVICTION_COUNT, METRICS_PROPSTORE_REFRESH_COUNT,
         METRICS_PROPSTORE_REFRESH_LOAD_COUNT, METRICS_PROPSTORE_ZK_ERROR_COUNT,
         METRICS_TSERVER_TABLETS_ONLINE_ONDEMAND, 
METRICS_TSERVER_TABLETS_ONDEMAND_UNLOADED_FOR_MEM,
-        METRICS_COMPACTOR_MAJC_STUCK);
+        METRICS_COMPACTOR_MAJC_STUCK, METRICS_MANAGER_ROOT_TGW_ERRORS,
+        METRICS_MANAGER_META_TGW_ERRORS, METRICS_MANAGER_USER_TGW_ERRORS);
 
     Map<String,String> expectedMetricNames = this.getMetricFields();
     flakyMetrics.forEach(expectedMetricNames::remove); // might not see these