(iotdb) branch master updated: Fix some errors of writing metric (#11867)

[haonan]

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

haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 038277a1882 Fix some errors of writing metric (#11867)
038277a1882 is described below

commit 038277a188294e4a2c93dbdf6f6e84fe4d3f6755
Author: Haonan <hhao...@outlook.com>
AuthorDate: Tue Jan 9 19:07:55 2024 +0800

    Fix some errors of writing metric (#11867)
---
 .../iotdb/db/service/metrics/WritingMetrics.java   | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/WritingMetrics.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/WritingMetrics.java
index 5d30f6d1b1b..b77010b1641 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/WritingMetrics.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/metrics/WritingMetrics.java
@@ -31,6 +31,7 @@ import 
org.apache.iotdb.db.storageengine.dataregion.wal.checkpoint.CheckpointTyp
 import org.apache.iotdb.metrics.AbstractMetricService;
 import org.apache.iotdb.metrics.impl.DoNothingMetricManager;
 import org.apache.iotdb.metrics.metricsets.IMetricSet;
+import org.apache.iotdb.metrics.type.Gauge;
 import org.apache.iotdb.metrics.type.Histogram;
 import org.apache.iotdb.metrics.type.Timer;
 import org.apache.iotdb.metrics.utils.MetricLevel;
@@ -343,8 +344,8 @@ public class WritingMetrics implements IMetricSet {
       "oldest_mem_table_ram_when_cause_flush";
   public static final String FLUSH_TSFILE_SIZE = "flush_tsfile_size";
 
-  private Histogram flushThreholdHistogram = 
DoNothingMetricManager.DO_NOTHING_HISTOGRAM;
-  private Histogram rejectThreholdHistogram = 
DoNothingMetricManager.DO_NOTHING_HISTOGRAM;
+  private Gauge flushThreholdGauge = DoNothingMetricManager.DO_NOTHING_GAUGE;
+  private Gauge rejectThreholdGauge = DoNothingMetricManager.DO_NOTHING_GAUGE;
 
   private Timer memtableLiveTimer = DoNothingMetricManager.DO_NOTHING_TIMER;
 
@@ -359,12 +360,12 @@ public class WritingMetrics implements IMetricSet {
     allDataRegionIds.forEach(this::createActiveMemtableCounterMetrics);
     createActiveTimePartitionCounterMetrics();
 
-    flushThreholdHistogram =
+    flushThreholdGauge =
         MetricService.getInstance()
-            .getOrCreateHistogram(Metric.FLUSH_THRESHOLD.toString(), 
MetricLevel.IMPORTANT);
-    rejectThreholdHistogram =
+            .getOrCreateGauge(Metric.FLUSH_THRESHOLD.toString(), 
MetricLevel.IMPORTANT);
+    rejectThreholdGauge =
         MetricService.getInstance()
-            .getOrCreateHistogram(Metric.REJECT_THRESHOLD.toString(), 
MetricLevel.IMPORTANT);
+            .getOrCreateGauge(Metric.REJECT_THRESHOLD.toString(), 
MetricLevel.IMPORTANT);
 
     memtableLiveTimer =
         MetricService.getInstance()
@@ -383,8 +384,8 @@ public class WritingMetrics implements IMetricSet {
           removeActiveMemtableCounterMetrics(dataRegionId);
         });
     removeActiveTimePartitionCounterMetrics();
-    MetricService.getInstance().remove(MetricType.HISTOGRAM, 
Metric.FLUSH_THRESHOLD.toString());
-    MetricService.getInstance().remove(MetricType.HISTOGRAM, 
Metric.REJECT_THRESHOLD.toString());
+    MetricService.getInstance().remove(MetricType.GAUGE, 
Metric.FLUSH_THRESHOLD.toString());
+    MetricService.getInstance().remove(MetricType.GAUGE, 
Metric.REJECT_THRESHOLD.toString());
     MetricService.getInstance().remove(MetricType.TIMER, 
Metric.MEMTABLE_LIVE_DURATION.toString());
   }
 
@@ -501,7 +502,7 @@ public class WritingMetrics implements IMetricSet {
 
   public void createActiveTimePartitionCounterMetrics() {
     MetricService.getInstance()
-        .getOrCreateCounter(Metric.ACTIVE_MEMTABLE_COUNT.toString(), 
MetricLevel.IMPORTANT);
+        .getOrCreateCounter(Metric.ACTIVE_TIME_PARTITION_COUNT.toString(), 
MetricLevel.IMPORTANT);
   }
 
   public void removeSeriesFullFlushMemTableCounterMetrics(DataRegionId 
dataRegionId) {
@@ -765,11 +766,11 @@ public class WritingMetrics implements IMetricSet {
   }
 
   public void recordFlushThreshold(double flushThreshold) {
-    flushThreholdHistogram.update((long) flushThreshold);
+    flushThreholdGauge.set((long) flushThreshold);
   }
 
   public void recordRejectThreshold(double rejectThreshold) {
-    rejectThreholdHistogram.update((long) rejectThreshold);
+    rejectThreholdGauge.set((long) rejectThreshold);
   }
 
   public void recordMemTableLiveDuration(long durationMillis) {