You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/17 03:55:56 UTC
[iotdb] branch master updated: remove enable_performance_stat in iotdb-engine.properties, and add enablePerformanceStat in iotdb-metric.yml (#5920)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr 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 e108016b52 remove enable_performance_stat in iotdb-engine.properties, and add enablePerformanceStat in iotdb-metric.yml (#5920)
e108016b52 is described below
commit e108016b528c45d7877f709e03c73cee409e779c
Author: ZhangHongYin <46...@users.noreply.github.com>
AuthorDate: Tue May 17 11:55:50 2022 +0800
remove enable_performance_stat in iotdb-engine.properties, and add enablePerformanceStat in iotdb-metric.yml (#5920)
---
.../src/main/assembly/resources/conf/iotdb-metric.yml | 3 +++
.../java/org/apache/iotdb/metrics/config/MetricConfig.java | 11 +++++++++++
server/src/assembly/resources/conf/iotdb-engine.properties | 4 ----
.../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 -----------
.../main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 7 -------
.../iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java | 3 ++-
.../apache/iotdb/db/service/thrift/impl/TSServiceImpl.java | 3 ++-
7 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/metrics/interface/src/main/assembly/resources/conf/iotdb-metric.yml b/metrics/interface/src/main/assembly/resources/conf/iotdb-metric.yml
index 53e9bef194..39c498747a 100644
--- a/metrics/interface/src/main/assembly/resources/conf/iotdb-metric.yml
+++ b/metrics/interface/src/main/assembly/resources/conf/iotdb-metric.yml
@@ -20,6 +20,9 @@
# whether enable the module
enableMetric: false
+# Is stat performance of sub-module enable
+enablePerformanceStat: false
+
# Multiple reporter, options: [JMX, PROMETHEUS, IOTDB], IOTDB is off by default
metricReporterList:
- JMX
diff --git a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
index 5a00a05cfe..2c8444b7f3 100644
--- a/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
+++ b/metrics/interface/src/main/java/org/apache/iotdb/metrics/config/MetricConfig.java
@@ -33,6 +33,9 @@ public class MetricConfig {
/** enable publishing data. */
private Boolean enableMetric = false;
+ /** Is stat performance of sub-module enable */
+ private Boolean enablePerformanceStat = false;
+
/** The of monitor frame */
private MonitorType monitorType = MonitorType.MICROMETER;
@@ -168,6 +171,14 @@ public class MetricConfig {
this.enableMetric = enableMetric;
}
+ public Boolean getEnablePerformanceStat() {
+ return enablePerformanceStat;
+ }
+
+ public void setEnablePerformanceStat(Boolean enablePerformanceStat) {
+ this.enablePerformanceStat = enablePerformanceStat;
+ }
+
public MonitorType getMonitorType() {
return monitorType;
}
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 3235dd92e4..67c77c150c 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -654,10 +654,6 @@ timestamp_precision=ms
### performance statistic configuration
####################
-# Is stat performance of sub-module enable
-# Datatype: boolean
-# enable_performance_stat=false
-
# Uncomment following fields to configure the tracing root directory.
# For Window platform, the index is as follows:
# tracing_dir=data\\tracing
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 8cf84cf10c..1177b9940f 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -508,9 +508,6 @@ public class IoTDBConfig {
/** Replace implementation class of influxdb protocol service */
private String influxdbImplClassName = InfluxDBServiceImpl.class.getName();
- /** Is stat performance of sub-module enable. */
- private boolean enablePerformanceStat = false;
-
/** whether use chunkBufferPool. */
private boolean chunkBufferPoolEnable = false;
@@ -1605,14 +1602,6 @@ public class IoTDBConfig {
this.externalSortThreshold = externalSortThreshold;
}
- public boolean isEnablePerformanceStat() {
- return enablePerformanceStat;
- }
-
- public void setEnablePerformanceStat(boolean enablePerformanceStat) {
- this.enablePerformanceStat = enablePerformanceStat;
- }
-
public boolean isEnablePartialInsert() {
return enablePartialInsert;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 40b680bfed..206484f2b8 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -593,13 +593,6 @@ public class IoTDBDescriptor {
properties.getProperty(
"enable_partial_insert", String.valueOf(conf.isEnablePartialInsert()))));
- conf.setEnablePerformanceStat(
- Boolean.parseBoolean(
- properties
- .getProperty(
- "enable_performance_stat", Boolean.toString(conf.isEnablePerformanceStat()))
- .trim()));
-
int maxConcurrentClientNum =
Integer.parseInt(
properties.getProperty(
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
index c86f88b097..10fe232ed8 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
@@ -53,6 +53,7 @@ import org.apache.iotdb.db.service.basic.BasicOpenSessionResp;
import org.apache.iotdb.db.service.metrics.MetricsService;
import org.apache.iotdb.db.service.metrics.Operation;
import org.apache.iotdb.db.utils.QueryDataSetUtils;
+import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
import org.apache.iotdb.metrics.utils.MetricLevel;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -1059,7 +1060,7 @@ public class DataNodeTSIServiceImpl implements TSIEventHandler {
/** Add stat of operation into metrics */
private void addOperationLatency(Operation operation, long startTime) {
- if (CONFIG.isEnablePerformanceStat()) {
+ if (MetricConfigDescriptor.getInstance().getMetricConfig().getEnablePerformanceStat()) {
MetricsService.getInstance()
.getMetricManager()
.histogram(
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
index a1b5317146..febb2e1955 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/TSServiceImpl.java
@@ -76,6 +76,7 @@ import org.apache.iotdb.db.service.metrics.Operation;
import org.apache.iotdb.db.tools.watermark.GroupedLSBWatermarkEncoder;
import org.apache.iotdb.db.tools.watermark.WatermarkEncoder;
import org.apache.iotdb.db.utils.QueryDataSetUtils;
+import org.apache.iotdb.metrics.config.MetricConfigDescriptor;
import org.apache.iotdb.metrics.utils.MetricLevel;
import org.apache.iotdb.rpc.RedirectException;
import org.apache.iotdb.rpc.RpcUtils;
@@ -2074,7 +2075,7 @@ public class TSServiceImpl implements TSIEventHandler {
/** Add stat of operation into metrics */
private void addOperationLatency(Operation operation, long startTime) {
- if (CONFIG.isEnablePerformanceStat()) {
+ if (MetricConfigDescriptor.getInstance().getMetricConfig().getEnablePerformanceStat()) {
MetricsService.getInstance()
.getMetricManager()
.histogram(