You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2022/12/21 02:49:14 UTC

[iotdb] branch rel/1.0 updated: Upgrade the metric of flush from important to core (#8524) (#8543)

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

tanxinyu pushed a commit to branch rel/1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/1.0 by this push:
     new 44d773247a Upgrade the metric of flush from important to core (#8524) (#8543)
44d773247a is described below

commit 44d773247a75dc02611e693e1aed758305b39e43
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Wed Dec 21 10:49:09 2022 +0800

    Upgrade the metric of flush from important to core (#8524) (#8543)
    
    (cherry picked from commit 64f3460b88f28f8801630a3dafedfacdc7d4965f)
---
 docs/UserGuide/Monitor-Alert/Metric-Tool.md                           | 4 ++--
 docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md                        | 4 ++--
 .../main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/UserGuide/Monitor-Alert/Metric-Tool.md b/docs/UserGuide/Monitor-Alert/Metric-Tool.md
index 92cd563eb6..b8bee3f678 100644
--- a/docs/UserGuide/Monitor-Alert/Metric-Tool.md
+++ b/docs/UserGuide/Monitor-Alert/Metric-Tool.md
@@ -83,9 +83,10 @@ Core-level metrics are enabled by default during system operation. The addition
 
 #### 4.1.1. Cluster
 | Metric      | Tags                                            | Type      | Description                                         |
-| ----------- | ----------------------------------------------- | --------- | --------------------------------------------------- |
+|-------------|-------------------------------------------------| --------- | --------------------------------------------------- |
 | config_node | name="total",status="Registered/Online/Unknown" | AutoGauge | The number of registered/online/unknown confignodes |
 | data_node   | name="total",status="Registered/Online/Unknown" | AutoGauge | The number of registered/online/unknown datanodes   |
+| points      | database="{{database}}", type="flush"           | Gauge     | The point number of last flushed memtable                     |
 
 #### 4.1.2. IoTDB process
 | Metric            | Tags           | Type      | Description                                            |
@@ -123,7 +124,6 @@ Core-level metrics are enabled by default during system operation. The addition
 | quantity | name="database"                            | AutoGauge | The number of database                                        |
 | quantity | name="timeSeries"                          | AutoGauge | The number of timeseries                                      |
 | quantity | name="pointsIn"                            | Counter   | The number of write points                                    |
-| points   | database="{{database}}", type="flush"      | Gauge     | The point number of last flushed memtable                     |
 | region   | name="total",type="SchemaRegion"           | AutoGauge | The total number of SchemaRegion in PartitionTable            |
 | region   | name="total",type="DataRegion"             | AutoGauge | The total number of DataRegion in PartitionTable              |
 | region   | name="{{ip}}:{{port}}",type="SchemaRegion" | Gauge     | The number of SchemaRegion in PartitionTable of specific node |
diff --git a/docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md b/docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md
index cafd2f257e..72c60198c2 100644
--- a/docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md
+++ b/docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md
@@ -84,9 +84,10 @@ Core 级别的监控指标在系统运行中默认开启,每一个 Core 级别
 #### 4.1.1. 集群运行状态
 
 | Metric      | Tags                                            | Type      | Description                            |
-| ----------- | ----------------------------------------------- | --------- | -------------------------------------- |
+|-------------|-------------------------------------------------| --------- | -------------------------------------- |
 | config_node | name="total",status="Registered/Online/Unknown" | AutoGauge | 已注册/在线/离线 confignode 的节点数量 |
 | data_node   | name="total",status="Registered/Online/Unknown" | AutoGauge | 已注册/在线/离线 datanode 的节点数量   |
+| points      | database="{{database}}", type="flush"           | Gauge     | 最新一个刷盘的memtale的点数        |
 
 #### 4.1.2. IoTDB 进程运行状态
 | Metric            | Tags           | Type      | Description                         |
@@ -126,7 +127,6 @@ Core 级别的监控指标在系统运行中默认开启,每一个 Core 级别
 | quantity | name="database"                            | AutoGauge | 系统数据库数量                  |
 | quantity | name="timeSeries"                          | AutoGauge | 系统时间序列数量                 |
 | quantity | name="pointsIn"                            | Counter   | 系统累计写入点数                 |
-| points   | database="{{database}}", type="flush"      | Gauge     | 最新一个刷盘的memtale的点数        |
 | region   | name="total",type="SchemaRegion"           | AutoGauge | 分区表中 SchemaRegion 总数量    |
 | region   | name="total",type="DataRegion"             | AutoGauge | 分区表中 DataRegion 总数量      |
 | region   | name="{{ip}}:{{port}}",type="SchemaRegion" | Gauge     | 分区表中对应节点上 DataRegion 总数量 |
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
index 196fc3d866..138af6962e 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
@@ -256,7 +256,7 @@ public class MemTableFlushTask {
           if (!storageGroup.startsWith(IoTDBMetricsUtils.DATABASE)
               && MetricLevel.higherOrEqual(
                   MetricConfigDescriptor.getInstance().getMetricConfig().getMetricLevel(),
-                  MetricLevel.IMPORTANT)) {
+                  MetricLevel.CORE)) {
             int lastIndex = storageGroup.lastIndexOf("-");
             if (lastIndex == -1) {
               lastIndex = storageGroup.length();
@@ -265,7 +265,7 @@ public class MemTableFlushTask {
                 .gaugeWithInternalReport(
                     memTable.getTotalPointsNum(),
                     Metric.POINTS.toString(),
-                    MetricLevel.IMPORTANT,
+                    MetricLevel.CORE,
                     Tag.DATABASE.toString(),
                     storageGroup.substring(0, lastIndex),
                     Tag.TYPE.toString(),