This is an automated email from the ASF dual-hosted git repository.
edcoleman pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit f9dabfc2501b893695bb04abf7d387f696851b98
Merge: 14efea2e75 4a5d8da7a5
Author: Ed Coleman <edcole...@apache.org>
AuthorDate: Fri May 24 15:23:38 2024 +0000
Merge remote-tracking branch 'upstream/main' into elasticity
.../accumulo/core/metrics/MetricsProducer.java | 8 +++--
.../org/apache/accumulo/tserver/ScanServer.java | 15 +++++----
.../apache/accumulo/tserver/ScanServerMetrics.java | 38 ++++++++++++++++++----
.../apache/accumulo/test/metrics/MetricsIT.java | 3 +-
4 files changed, 47 insertions(+), 17 deletions(-)
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index f9aed7e2cf,616800168e..323117c0c3
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@@ -90,8 -89,8 +90,9 @@@ import org.apache.accumulo.core.tablets
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.util.Halt;
import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.core.util.cache.Caches.CacheName;
import org.apache.accumulo.core.util.threads.ThreadPools;
+ import org.apache.accumulo.core.util.time.NanoTime;
import org.apache.accumulo.server.AbstractServer;
import org.apache.accumulo.server.ServerContext;
import org.apache.accumulo.server.client.ClientServiceHandler;
diff --cc test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
index 53f9bbbb81,0b76970d6d..402ed1ff50
--- a/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/metrics/MetricsIT.java
@@@ -103,13 -96,13 +103,14 @@@ public class MetricsIT extends Configur
@Test
public void confirmMetricsPublished() throws Exception {
- doWorkToGenerateMetrics();
- cluster.stop();
-
Set<String> unexpectedMetrics = Set.of(METRICS_COMPACTOR_MAJC_STUCK,
METRICS_SCAN_YIELDS);
- 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_TABLET_METADATA_CACHE);
+ Set<String> flakyMetrics = Set.of(METRICS_GC_WAL_ERRORS,
METRICS_FATE_TYPE_IN_PROGRESS,
+ METRICS_TSERVER_TABLETS_ONLINE_ONDEMAND,
METRICS_TSERVER_TABLETS_ONDEMAND_UNLOADED_FOR_MEM,
+ METRICS_COMPACTOR_MAJC_STUCK, METRICS_MANAGER_ROOT_TGW_ERRORS,
+ METRICS_MANAGER_META_TGW_ERRORS, METRICS_MANAGER_USER_TGW_ERRORS,
+ METRICS_SCAN_TABLET_METADATA_CACHE, METRICS_SCAN_BUSY_TIMEOUT_COUNTER,
- METRICS_SCAN_RESERVATION_TIMER, METRICS_SERVER_IDLE);
++ METRICS_SCAN_RESERVATION_TOTAL_TIMER,
METRICS_SCAN_RESERVATION_WRITEOUT_TIMER,
++ METRICS_SERVER_IDLE);
Map<String,String> expectedMetricNames = this.getMetricFields();
flakyMetrics.forEach(expectedMetricNames::remove); // might not see these
