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 2023/04/28 10:34:45 UTC
[iotdb] branch master updated: [IOTDB-5701] Upgrade Performance Overview Metrics to Core (#9741)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu 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 5fb6e2b76c6 [IOTDB-5701] Upgrade Performance Overview Metrics to Core (#9741)
5fb6e2b76c6 is described below
commit 5fb6e2b76c6e2275feba04fe7f565b5905e49910
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Fri Apr 28 18:34:37 2023 +0800
[IOTDB-5701] Upgrade Performance Overview Metrics to Core (#9741)
---
.../org/apache/iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
.../apache/iotdb/db/service/metrics/CompactionMetrics.java | 12 +++---------
.../service/metrics/recorder/CompactionMetricsManager.java | 6 +++---
.../apache/iotdb/db/service/thrift/ProcessorWithMetrics.java | 2 +-
.../iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java | 2 +-
.../java/org/apache/iotdb/db/metric/MetricServiceTest.java | 3 ---
6 files changed, 9 insertions(+), 18 deletions(-)
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 fc12a033f72..18d87b28b44 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
@@ -207,7 +207,7 @@ public class MemTableFlushTask {
System.currentTimeMillis() - start,
TimeUnit.MILLISECONDS,
Metric.COST_TASK.toString(),
- MetricLevel.IMPORTANT,
+ MetricLevel.CORE,
Tag.NAME.toString(),
"flush");
diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/CompactionMetrics.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/CompactionMetrics.java
index 6ef7ad973a6..a76d22d01c7 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/metrics/CompactionMetrics.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/CompactionMetrics.java
@@ -120,20 +120,14 @@ public class CompactionMetrics implements IMetricSet {
Tag.NAME.toString(),
"cross");
metricService.getOrCreateTimer(
- Metric.COST_TASK.toString(),
- MetricLevel.IMPORTANT,
- Tag.NAME.toString(),
- "inner_seq_compaction");
+ Metric.COST_TASK.toString(), MetricLevel.CORE, Tag.NAME.toString(), "inner_seq_compaction");
metricService.getOrCreateTimer(
Metric.COST_TASK.toString(),
- MetricLevel.IMPORTANT,
+ MetricLevel.CORE,
Tag.NAME.toString(),
"inner_unseq_compaction");
metricService.getOrCreateTimer(
- Metric.COST_TASK.toString(),
- MetricLevel.IMPORTANT,
- Tag.NAME.toString(),
- "cross_compaction");
+ Metric.COST_TASK.toString(), MetricLevel.CORE, Tag.NAME.toString(), "cross_compaction");
}
private void unbindTaskInfo(AbstractMetricService metricService) {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/recorder/CompactionMetricsManager.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/recorder/CompactionMetricsManager.java
index 6f531373aac..24a466b341d 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/metrics/recorder/CompactionMetricsManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/recorder/CompactionMetricsManager.java
@@ -159,7 +159,7 @@ public class CompactionMetricsManager {
timeCost,
TimeUnit.MILLISECONDS,
Metric.COST_TASK.toString(),
- MetricLevel.IMPORTANT,
+ MetricLevel.CORE,
Tag.NAME.toString(),
"cross_compaction");
} else if (isSeq) {
@@ -170,7 +170,7 @@ public class CompactionMetricsManager {
timeCost,
TimeUnit.MILLISECONDS,
Metric.COST_TASK.toString(),
- MetricLevel.IMPORTANT,
+ MetricLevel.CORE,
Tag.NAME.toString(),
"inner_seq_compaction");
} else {
@@ -181,7 +181,7 @@ public class CompactionMetricsManager {
timeCost,
TimeUnit.MILLISECONDS,
Metric.COST_TASK.toString(),
- MetricLevel.IMPORTANT,
+ MetricLevel.CORE,
Tag.NAME.toString(),
"inner_unseq_compaction");
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/ProcessorWithMetrics.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/ProcessorWithMetrics.java
index 50ccfcdf064..ae55b976fa0 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/ProcessorWithMetrics.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/ProcessorWithMetrics.java
@@ -69,7 +69,7 @@ public class ProcessorWithMetrics extends Processor {
cost,
TimeUnit.MILLISECONDS,
Metric.ENTRY.toString(),
- MetricLevel.IMPORTANT,
+ MetricLevel.CORE,
Tag.NAME.toString(),
msg.name);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
index e1c31f3231c..5d1456935b3 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
@@ -2177,7 +2177,7 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
costTime,
TimeUnit.MILLISECONDS,
Metric.PERFORMANCE_OVERVIEW.toString(),
- MetricLevel.IMPORTANT,
+ MetricLevel.CORE,
Tag.INTERFACE.toString(),
operation.toString(),
Tag.TYPE.toString(),
diff --git a/server/src/test/java/org/apache/iotdb/db/metric/MetricServiceTest.java b/server/src/test/java/org/apache/iotdb/db/metric/MetricServiceTest.java
index e0c7fc91b86..18dfa7df4fd 100644
--- a/server/src/test/java/org/apache/iotdb/db/metric/MetricServiceTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metric/MetricServiceTest.java
@@ -149,9 +149,6 @@ public class MetricServiceTest {
assertEquals(0d, autoGauge.value(), DELTA);
list.add(1);
assertEquals(1d, autoGauge.value(), DELTA);
- list = null;
- System.gc();
- assertEquals(0d, autoGauge.value(), DELTA);
assertEquals(4, metricService.getMetricsByType(MetricType.GAUGE).size());
assertEquals(1, metricService.getMetricsByType(MetricType.AUTO_GAUGE).size());
metricService.remove(MetricType.AUTO_GAUGE, "autoGauge", "tag", "value");