This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 04262c07d776cf9b5bab5b008adb24b2c00f42b9 Merge: 12898a36b7 313238b5e8 Author: Christopher Tubbs <[email protected]> AuthorDate: Mon Aug 14 00:44:18 2023 -0400 Merge branch '2.1' .../accumulo/core/metrics/MetricsProducer.java | 31 +++++++++++----------- .../tserver/metrics/TabletServerScanMetrics.java | 2 +- 2 files changed, 17 insertions(+), 16 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java index 9e8e6ec5d1,82db7f71b2..a2aa7d6a9a --- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java +++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java @@@ -635,18 -635,22 +635,19 @@@ public interface MetricsProducer String METRICS_MINC_PREFIX = "accumulo.tserver.compactions.minc."; String METRICS_MINC_QUEUED = METRICS_MINC_PREFIX + "queued"; String METRICS_MINC_RUNNING = METRICS_MINC_PREFIX + "running"; - - String METRICS_REPLICATION_PREFIX = "accumulo.replication."; - String METRICS_REPLICATION_QUEUE = METRICS_REPLICATION_PREFIX + "queue"; - String METRICS_REPLICATION_PENDING_FILES = METRICS_REPLICATION_PREFIX + "files.pending"; - String METRICS_REPLICATION_PEERS = METRICS_REPLICATION_PREFIX + "peers"; - String METRICS_REPLICATION_THREADS = METRICS_REPLICATION_PREFIX + "threads"; + String METRICS_MINC_PAUSED = METRICS_MINC_PREFIX + "paused"; - String METRICS_SCAN = "accumulo.tserver.scans"; - String METRICS_SCAN_OPEN_FILES = METRICS_SCAN + ".files.open"; - String METRICS_SCAN_RESULTS = METRICS_SCAN + ".result"; - String METRICS_SCAN_YIELDS = METRICS_SCAN + ".yields"; - String METRICS_SCAN_START = METRICS_SCAN + ".start"; - String METRICS_SCAN_CONTINUE = METRICS_SCAN + ".continue"; - String METRICS_SCAN_CLOSE = METRICS_SCAN + ".close"; - String METRICS_SCAN_BUSY_TIMEOUT = METRICS_SCAN + ".busy_timeout"; - String METRICS_SCAN_PAUSED_FOR_MEM = METRICS_SCAN + ".paused.for.memory"; - String METRICS_SCAN_RETURN_FOR_MEM = METRICS_SCAN + ".return.early.for.memory"; + String METRICS_SCAN_PREFIX = "accumulo.tserver.scans."; + String METRICS_SCAN_TIMES = METRICS_SCAN_PREFIX + "times"; + String METRICS_SCAN_OPEN_FILES = METRICS_SCAN_PREFIX + "files.open"; + String METRICS_SCAN_RESULTS = METRICS_SCAN_PREFIX + "result"; + String METRICS_SCAN_YIELDS = METRICS_SCAN_PREFIX + "yields"; + String METRICS_SCAN_START = METRICS_SCAN_PREFIX + "start"; + String METRICS_SCAN_CONTINUE = METRICS_SCAN_PREFIX + "continue"; + String METRICS_SCAN_CLOSE = METRICS_SCAN_PREFIX + "close"; + String METRICS_SCAN_BUSY_TIMEOUT = METRICS_SCAN_PREFIX + "busy.timeout"; ++ String METRICS_SCAN_PAUSED_FOR_MEM = METRICS_SCAN_PREFIX + ".paused.for.memory"; ++ String METRICS_SCAN_RETURN_FOR_MEM = METRICS_SCAN_PREFIX + ".return.early.for.memory"; String METRICS_TSERVER_PREFIX = "accumulo.tserver."; String METRICS_TSERVER_ENTRIES = METRICS_TSERVER_PREFIX + "entries";
