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

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


The following commit(s) were added to refs/heads/main by this push:
     new 5de04df3da Added compaction and scan metric categories, renamed 
metrics (#5075)
5de04df3da is described below

commit 5de04df3da317c1064fe82bc67e02fe1e65c1834
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Nov 21 07:56:42 2024 -0500

    Added compaction and scan metric categories, renamed metrics (#5075)
    
    Renamed some metrics to use a name that represents their function
    vs where they execute. Added two new categories for the docs
    
    
    Co-authored-by: Keith Turner <ktur...@apache.org>
---
 .../org/apache/accumulo/core/metrics/Metric.java   | 94 +++++++++++-----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/metrics/Metric.java 
b/core/src/main/java/org/apache/accumulo/core/metrics/Metric.java
index 8ad14a5597..4ef5afbce4 100644
--- a/core/src/main/java/org/apache/accumulo/core/metrics/Metric.java
+++ b/core/src/main/java/org/apache/accumulo/core/metrics/Metric.java
@@ -31,38 +31,38 @@ public enum Metric {
       MetricCategory.GENERAL_SERVER),
 
   // Compactor Metrics
-  COMPACTOR_MAJC_STUCK("accumulo.compactor.majc.stuck", 
MetricType.LONG_TASK_TIMER,
-      "Number and duration of stuck major compactions.", 
MetricCategory.COMPACTOR),
+  COMPACTOR_MAJC_STUCK("accumulo.compaction.majc.stuck", 
MetricType.LONG_TASK_TIMER,
+      "Number and duration of stuck major compactions.", 
MetricCategory.COMPACTION),
   COMPACTOR_ENTRIES_READ("accumulo.compactor.entries.read", 
MetricType.FUNCTION_COUNTER,
       "Number of entries read by all compactions that have run on this 
compactor.",
       MetricCategory.COMPACTOR),
   COMPACTOR_ENTRIES_WRITTEN("accumulo.compactor.entries.written", 
MetricType.FUNCTION_COUNTER,
       "Number of entries written by all compactions that have run on this 
compactor.",
       MetricCategory.COMPACTOR),
-  COMPACTOR_JOB_PRIORITY_QUEUES("accumulo.compactor.queue.count", 
MetricType.GAUGE,
-      "Number of priority queues for compaction jobs.", 
MetricCategory.COMPACTOR),
-  COMPACTOR_JOB_PRIORITY_QUEUE_LENGTH("accumulo.compactor.queue.length", 
MetricType.GAUGE,
-      "Length of priority queue.", MetricCategory.COMPACTOR),
-  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_DEQUEUED("accumulo.compactor.queue.jobs.dequeued",
-      MetricType.GAUGE, "Count of dequeued jobs.", MetricCategory.COMPACTOR),
-  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_QUEUED("accumulo.compactor.queue.jobs.queued",
 MetricType.GAUGE,
-      "Count of queued jobs.", MetricCategory.COMPACTOR),
-  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_REJECTED("accumulo.compactor.queue.jobs.rejected",
-      MetricType.GAUGE, "Count of rejected jobs.", MetricCategory.COMPACTOR),
-  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_PRIORITY("accumulo.compactor.queue.jobs.priority",
-      MetricType.GAUGE, "Lowest priority queued job.", 
MetricCategory.COMPACTOR),
-  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_MIN_AGE("accumulo.compactor.queue.jobs.min.age",
+  COMPACTOR_JOB_PRIORITY_QUEUES("accumulo.compaction.queue.count", 
MetricType.GAUGE,
+      "Number of priority queues for compaction jobs.", 
MetricCategory.COMPACTION),
+  COMPACTOR_JOB_PRIORITY_QUEUE_LENGTH("accumulo.compaction.queue.length", 
MetricType.GAUGE,
+      "Length of priority queue.", MetricCategory.COMPACTION),
+  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_DEQUEUED("accumulo.compaction.queue.jobs.dequeued",
+      MetricType.GAUGE, "Count of dequeued jobs.", MetricCategory.COMPACTION),
+  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_QUEUED("accumulo.compaction.queue.jobs.queued",
+      MetricType.GAUGE, "Count of queued jobs.", MetricCategory.COMPACTION),
+  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_REJECTED("accumulo.compaction.queue.jobs.rejected",
+      MetricType.GAUGE, "Count of rejected jobs.", MetricCategory.COMPACTION),
+  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_PRIORITY("accumulo.compaction.queue.jobs.priority",
+      MetricType.GAUGE, "Lowest priority queued job.", 
MetricCategory.COMPACTION),
+  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_MIN_AGE("accumulo.compaction.queue.jobs.min.age",
       MetricType.GAUGE, "Minimum age of currently queued jobs in seconds.",
-      MetricCategory.COMPACTOR),
-  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_MAX_AGE("accumulo.compactor.queue.jobs.max.age",
+      MetricCategory.COMPACTION),
+  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_MAX_AGE("accumulo.compaction.queue.jobs.max.age",
       MetricType.GAUGE, "Maximum age of currently queued jobs in seconds.",
-      MetricCategory.COMPACTOR),
-  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_AVG_AGE("accumulo.compactor.queue.jobs.avg.age",
+      MetricCategory.COMPACTION),
+  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_AVG_AGE("accumulo.compaction.queue.jobs.avg.age",
       MetricType.GAUGE, "Average age of currently queued jobs in seconds.",
-      MetricCategory.COMPACTOR),
-  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_POLL_TIMER("accumulo.compactor.queue.jobs.exit.time",
+      MetricCategory.COMPACTION),
+  
COMPACTOR_JOB_PRIORITY_QUEUE_JOBS_POLL_TIMER("accumulo.compaction.queue.jobs.exit.time",
       MetricType.TIMER, "Tracks time a job spent in the queue before exiting 
the queue.",
-      MetricCategory.COMPACTOR),
+      MetricCategory.COMPACTION),
 
   // Fate Metrics
   FATE_TYPE_IN_PROGRESS("accumulo.fate.ops.in.progress.by.type", 
MetricType.GAUGE,
@@ -117,11 +117,11 @@ public enum Metric {
   TSERVER_MEM_ENTRIES("accumulo.tserver.entries.mem", MetricType.GAUGE,
       "Number of entries in memory.", MetricCategory.TABLET_SERVER),
   TSERVER_MINC_QUEUED("accumulo.tserver.minc.queued", MetricType.GAUGE,
-      "Number of queued minor compactions.", MetricCategory.TABLET_SERVER),
+      "Number of queued minor compactions.", MetricCategory.COMPACTION),
   TSERVER_MINC_RUNNING("accumulo.tserver.minc.running", MetricType.GAUGE,
-      "Number of active minor compactions.", MetricCategory.TABLET_SERVER),
+      "Number of active minor compactions.", MetricCategory.COMPACTION),
   TSERVER_MINC_TOTAL("accumulo.tserver.minc.total", MetricType.GAUGE,
-      "Total number of minor compactions performed.", 
MetricCategory.TABLET_SERVER),
+      "Total number of minor compactions performed.", 
MetricCategory.COMPACTION),
   TSERVER_TABLETS_ONLINE("accumulo.tserver.tablets.online", MetricType.GAUGE,
       "Number of online tablets.", MetricCategory.TABLET_SERVER),
   
TSERVER_TABLETS_LONG_ASSIGNMENTS("accumulo.tserver.tablets.assignments.warning",
 MetricType.GAUGE,
@@ -159,53 +159,51 @@ public enum Metric {
   SCAN_TABLET_METADATA_CACHE("accumulo.scan.tablet.metadata.cache", 
MetricType.CACHE,
       "Scan server tablet cache metrics.", MetricCategory.SCAN_SERVER),
   SCAN_TIMES("accumulo.scan.times", MetricType.TIMER, "Scan session lifetime 
(creation to close).",
-      MetricCategory.SCAN_SERVER),
+      MetricCategory.SCAN),
   SCAN_OPEN_FILES("accumulo.scan.files.open", MetricType.GAUGE, "Number of 
files open for scans.",
-      MetricCategory.SCAN_SERVER),
-  SCAN_RESULTS("accumulo.scan.result", MetricType.GAUGE, "Results per scan.",
-      MetricCategory.SCAN_SERVER),
+      MetricCategory.SCAN),
+  SCAN_RESULTS("accumulo.scan.result", MetricType.GAUGE, "Results per scan.", 
MetricCategory.SCAN),
   SCAN_YIELDS("accumulo.scan.yields", MetricType.GAUGE, "Counts scans that 
have yielded.",
-      MetricCategory.SCAN_SERVER),
+      MetricCategory.SCAN),
   SCAN_START("accumulo.scan.start", MetricType.COUNTER,
-      "Number of calls to start a scan or multiscan.", 
MetricCategory.SCAN_SERVER),
+      "Number of calls to start a scan or multiscan.", MetricCategory.SCAN),
   SCAN_CONTINUE("accumulo.scan.continue", MetricType.COUNTER,
-      "Number of calls to continue a scan or multiscan.", 
MetricCategory.SCAN_SERVER),
+      "Number of calls to continue a scan or multiscan.", MetricCategory.SCAN),
   SCAN_CLOSE("accumulo.scan.close", MetricType.COUNTER,
-      "Number of calls to close a scan or multiscan.", 
MetricCategory.SCAN_SERVER),
+      "Number of calls to close a scan or multiscan.", MetricCategory.SCAN),
   SCAN_QUERIES("accumulo.scan.queries", MetricType.GAUGE, "Number of queries 
made during scans.",
-      MetricCategory.SCAN_SERVER),
+      MetricCategory.SCAN),
   SCAN_SCANNED_ENTRIES("accumulo.scan.query.scanned.entries", MetricType.GAUGE,
-      "Count of scanned entries. The rate can be derived from this metric.",
-      MetricCategory.SCAN_SERVER),
+      "Count of scanned entries. The rate can be derived from this metric.", 
MetricCategory.SCAN),
   SCAN_QUERY_SCAN_RESULTS("accumulo.scan.query.results", MetricType.GAUGE,
-      "Query count. The rate can be derived from this metric.", 
MetricCategory.SCAN_SERVER),
+      "Query count. The rate can be derived from this metric.", 
MetricCategory.SCAN),
   SCAN_QUERY_SCAN_RESULTS_BYTES("accumulo.scan.query.results.bytes", 
MetricType.GAUGE,
-      "Query byte count. The rate can be derived from this metric.", 
MetricCategory.SCAN_SERVER),
+      "Query byte count. The rate can be derived from this metric.", 
MetricCategory.SCAN),
   SCAN_PAUSED_FOR_MEM("accumulo.scan.paused.for.memory", MetricType.COUNTER,
-      "Count of scans paused due to server being low on memory.", 
MetricCategory.SCAN_SERVER),
+      "Count of scans paused due to server being low on memory.", 
MetricCategory.SCAN),
   SCAN_RETURN_FOR_MEM("accumulo.scan.return.early.for.memory", 
MetricType.COUNTER,
       "Count of scans that returned results early due to server being low on 
memory.",
-      MetricCategory.SCAN_SERVER),
+      MetricCategory.SCAN),
   SCAN_ZOMBIE_THREADS("accumulo.scan.zombie.threads", MetricType.GAUGE,
-      "Number of scan threads that have no associated client session.", 
MetricCategory.SCAN_SERVER),
+      "Number of scan threads that have no associated client session.", 
MetricCategory.SCAN),
 
   // Major Compaction Metrics
   MAJC_QUEUED("accumulo.tserver.compactions.majc.queued", MetricType.GAUGE,
       "Number of queued major compactions. The compaction service information 
is in a tag: `id={i|e}_{compactionServiceName}_{executor_name}`.",
-      MetricCategory.TABLET_SERVER),
+      MetricCategory.COMPACTION),
   MAJC_RUNNING("accumulo.tserver.compactions.majc.running", MetricType.GAUGE,
       "Number of running major compactions. The compaction service information 
is in a tag: `id={i|e}_{compactionServiceName}_{executor_name}`.",
-      MetricCategory.TABLET_SERVER),
+      MetricCategory.COMPACTION),
   MAJC_PAUSED("accumulo.tserver.compactions.majc.paused", MetricType.COUNTER,
-      "Number of paused major compactions.", MetricCategory.TABLET_SERVER),
+      "Number of paused major compactions.", MetricCategory.COMPACTION),
 
   // Minor Compaction Metrics
   MINC_QUEUED("accumulo.tserver.compactions.minc.queued", MetricType.TIMER,
-      "Queued minor compactions time queued.", MetricCategory.TABLET_SERVER),
+      "Queued minor compactions time queued.", MetricCategory.COMPACTION),
   MINC_RUNNING("accumulo.tserver.compactions.minc.running", MetricType.TIMER,
-      "Minor compactions time active.", MetricCategory.TABLET_SERVER),
+      "Minor compactions time active.", MetricCategory.COMPACTION),
   MINC_PAUSED("accumulo.tserver.compactions.minc.paused", MetricType.COUNTER,
-      "Number of paused minor compactions.", MetricCategory.TABLET_SERVER),
+      "Number of paused minor compactions.", MetricCategory.COMPACTION),
 
   // Updates (Ingest) Metrics
   UPDATE_ERRORS("accumulo.tserver.updates.error", MetricType.GAUGE,
@@ -316,10 +314,12 @@ public enum Metric {
 
   public enum MetricCategory {
     GENERAL_SERVER("General Server Metrics"),
+    COMPACTION("Compaction Metrics"),
     COMPACTOR("Compactor Metrics"),
     FATE("Fate Metrics"),
     GARBAGE_COLLECTION("Garbage Collection Metrics"),
     TABLET_SERVER("Tablet Server Metrics"),
+    SCAN("Scan Metrics"),
     SCAN_SERVER("Scan Server Metrics"),
     THRIFT("Thrift Metrics"),
     BLOCK_CACHE("Block Cache Metrics"),

Reply via email to