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/06 12:45:28 UTC
[iotdb] branch rel/1.0 updated: cherry pick (#8352)
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 a40047de90 cherry pick (#8352)
a40047de90 is described below
commit a40047de908096bd151586b4023704580f6f50cd
Author: William Song <48...@users.noreply.github.com>
AuthorDate: Tue Dec 6 20:45:18 2022 +0800
cherry pick (#8352)
---
.../iotdb/confignode/conf/ConfigNodeConfig.java | 30 ++++++-------
.../confignode/conf/ConfigNodeDescriptor.java | 52 ++++++++++------------
.../iotdb/confignode/manager/ConsensusManager.java | 3 +-
.../iotdb/confignode/manager/node/NodeManager.java | 4 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 20 ++++-----
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +-
.../db/consensus/DataRegionConsensusImpl.java | 3 +-
.../db/consensus/SchemaRegionConsensusImpl.java | 3 +-
8 files changed, 55 insertions(+), 64 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index 6f6fe727f8..9db28f9472 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -262,9 +262,9 @@ public class ConfigNodeConfig {
private long ratisFirstElectionTimeoutMinMs = 50;
private long ratisFirstElectionTimeoutMaxMs = 150;
- private long configNodeRatisLogMaxMB = 2 * 1024;
- private long schemaRegionRatisLogMaxMB = 2 * 1024;
- private long dataRegionRatisLogMaxMB = 20 * 1024;
+ private long configNodeRatisLogMax = 2L * 1024 * 1024 * 1024; // 2G
+ private long schemaRegionRatisLogMax = 2L * 1024 * 1024 * 1024; // 2G
+ private long dataRegionRatisLogMax = 20L * 1024 * 1024 * 1024; // 20G
public ConfigNodeConfig() {
// empty constructor
@@ -1024,27 +1024,27 @@ public class ConfigNodeConfig {
this.ratisFirstElectionTimeoutMaxMs = ratisFirstElectionTimeoutMaxMs;
}
- public long getConfigNodeRatisLogMaxMB() {
- return configNodeRatisLogMaxMB;
+ public long getConfigNodeRatisLogMax() {
+ return configNodeRatisLogMax;
}
- public void setConfigNodeRatisLogMaxMB(long configNodeRatisLogMaxMB) {
- this.configNodeRatisLogMaxMB = configNodeRatisLogMaxMB;
+ public void setConfigNodeRatisLogMax(long configNodeRatisLogMax) {
+ this.configNodeRatisLogMax = configNodeRatisLogMax;
}
- public long getSchemaRegionRatisLogMaxMB() {
- return schemaRegionRatisLogMaxMB;
+ public long getSchemaRegionRatisLogMax() {
+ return schemaRegionRatisLogMax;
}
- public void setSchemaRegionRatisLogMaxMB(long schemaRegionRatisLogMaxMB) {
- this.schemaRegionRatisLogMaxMB = schemaRegionRatisLogMaxMB;
+ public void setSchemaRegionRatisLogMax(long schemaRegionRatisLogMax) {
+ this.schemaRegionRatisLogMax = schemaRegionRatisLogMax;
}
- public long getDataRegionRatisLogMaxMB() {
- return dataRegionRatisLogMaxMB;
+ public long getDataRegionRatisLogMax() {
+ return dataRegionRatisLogMax;
}
- public void setDataRegionRatisLogMaxMB(long dataRegionRatisLogMaxMB) {
- this.dataRegionRatisLogMaxMB = dataRegionRatisLogMaxMB;
+ public void setDataRegionRatisLogMax(long dataRegionRatisLogMax) {
+ this.dataRegionRatisLogMax = dataRegionRatisLogMax;
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index e6973e259b..6a88c0c9f9 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -717,35 +717,29 @@ public class ConfigNodeDescriptor {
String.valueOf(conf.getRatisFirstElectionTimeoutMaxMs()))
.trim()));
- conf.setConfigNodeRatisLogMaxMB(
- Long.parseLong(
- properties
- .getProperty(
- "config_node_ratis_log_max_size_mb",
- String.valueOf(conf.getConfigNodeRatisLogMaxMB()))
- .trim())
- / 1024
- / 1024);
-
- conf.setSchemaRegionRatisLogMaxMB(
- Long.parseLong(
- properties
- .getProperty(
- "schema_region_ratis_log_max_size_mb",
- String.valueOf(conf.getSchemaRegionRatisLogMaxMB()))
- .trim())
- / 1024
- / 1024);
-
- conf.setDataRegionRatisLogMaxMB(
- Long.parseLong(
- properties
- .getProperty(
- "data_region_ratis_log_max_size_mb",
- String.valueOf(conf.getDataRegionRatisLogMaxMB()))
- .trim())
- / 1024
- / 1024);
+ conf.setConfigNodeRatisLogMax(
+ Long.parseLong(
+ properties
+ .getProperty(
+ "config_node_ratis_log_max_size",
+ String.valueOf(conf.getConfigNodeRatisLogMax()))
+ .trim()));
+
+ conf.setSchemaRegionRatisLogMax(
+ Long.parseLong(
+ properties
+ .getProperty(
+ "schema_region_ratis_log_max_size",
+ String.valueOf(conf.getSchemaRegionRatisLogMax()))
+ .trim()));
+
+ conf.setDataRegionRatisLogMax(
+ Long.parseLong(
+ properties
+ .getProperty(
+ "data_region_ratis_log_max_size",
+ String.valueOf(conf.getDataRegionRatisLogMax()))
+ .trim()));
}
private void loadCQConfig(Properties properties) {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
index 5b95787136..25f1ab4b91 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
@@ -165,8 +165,7 @@ public class ConsensusManager {
CONF.getConfigNodeRatisInitialSleepTimeMs())
.setClientRetryMaxSleepTimeMs(
CONF.getConfigNodeRatisMaxSleepTimeMs())
- .setTriggerSnapshotFileSize(
- CONF.getConfigNodeRatisLogMaxMB() * 1024 * 1024)
+ .setTriggerSnapshotFileSize(CONF.getConfigNodeRatisLogMax())
.build())
.build())
.setStorageDir(CONF.getConsensusDir())
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
index a83ae0212d..3db0434a6a 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
@@ -209,8 +209,8 @@ public class NodeManager {
ratisConfig.setFirstElectionTimeoutMin(conf.getRatisFirstElectionTimeoutMinMs());
ratisConfig.setFirstElectionTimeoutMax(conf.getRatisFirstElectionTimeoutMaxMs());
- ratisConfig.setSchemaRegionRatisLogMax(conf.getSchemaRegionRatisLogMaxMB());
- ratisConfig.setDataRegionRatisLogMax(conf.getDataRegionRatisLogMaxMB());
+ ratisConfig.setSchemaRegionRatisLogMax(conf.getSchemaRegionRatisLogMax());
+ ratisConfig.setDataRegionRatisLogMax(conf.getDataRegionRatisLogMax());
dataSet.setRatisConfig(ratisConfig);
}
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 99dcf1b865..bf77df1972 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
@@ -1040,8 +1040,8 @@ public class IoTDBConfig {
private long ratisFirstElectionTimeoutMinMs = 50L;
private long ratisFirstElectionTimeoutMaxMs = 150L;
- private long dataRatisLogMaxMB = 20 * 1024;
- private long schemaRatisLogMaxMB = 2 * 1024;
+ private long dataRatisLogMax = 20L * 1024 * 1024 * 1024; // 20G
+ private long schemaRatisLogMax = 2L * 1024 * 1024 * 1024; // 2G
// customizedProperties, this should be empty by default.
private Properties customizedProperties = new Properties();
@@ -3575,20 +3575,20 @@ public class IoTDBConfig {
this.ratisFirstElectionTimeoutMaxMs = ratisFirstElectionTimeoutMaxMs;
}
- public long getDataRatisLogMaxMB() {
- return dataRatisLogMaxMB;
+ public long getDataRatisLogMax() {
+ return dataRatisLogMax;
}
- public void setDataRatisLogMaxMB(long dataRatisLogMaxMB) {
- this.dataRatisLogMaxMB = dataRatisLogMaxMB;
+ public void setDataRatisLogMax(long dataRatisLogMax) {
+ this.dataRatisLogMax = dataRatisLogMax;
}
- public long getSchemaRatisLogMaxMB() {
- return schemaRatisLogMaxMB;
+ public long getSchemaRatisLogMax() {
+ return schemaRatisLogMax;
}
- public void setSchemaRatisLogMaxMB(long schemaRatisLogMaxMB) {
- this.schemaRatisLogMaxMB = schemaRatisLogMaxMB;
+ public void setSchemaRatisLogMax(long schemaRatisLogMax) {
+ this.schemaRatisLogMax = schemaRatisLogMax;
}
public boolean isEnableCompactionValidation() {
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 7a25d6d21f..a238b744a6 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
@@ -1990,8 +1990,8 @@ public class IoTDBDescriptor {
conf.setRatisFirstElectionTimeoutMinMs(ratisConfig.getFirstElectionTimeoutMin());
conf.setRatisFirstElectionTimeoutMaxMs(ratisConfig.getFirstElectionTimeoutMax());
- conf.setSchemaRatisLogMaxMB(ratisConfig.getSchemaRegionRatisLogMax());
- conf.setDataRatisLogMaxMB(ratisConfig.getDataRegionRatisLogMax());
+ conf.setSchemaRatisLogMax(ratisConfig.getSchemaRegionRatisLogMax());
+ conf.setDataRatisLogMax(ratisConfig.getDataRegionRatisLogMax());
}
public void loadCQConfig(TCQConfig cqConfig) {
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java b/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
index af866ae6fc..852fbe80b8 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
@@ -157,8 +157,7 @@ public class DataRegionConsensusImpl {
conf.getDataRatisConsensusInitialSleepTimeMs())
.setClientRetryMaxSleepTimeMs(
conf.getDataRatisConsensusMaxSleepTimeMs())
- .setTriggerSnapshotFileSize(
- conf.getDataRatisLogMaxMB() * 1024 * 1024)
+ .setTriggerSnapshotFileSize(conf.getDataRatisLogMax())
.build())
.build())
.build(),
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java b/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
index e605084bd5..306292119f 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
@@ -125,8 +125,7 @@ public class SchemaRegionConsensusImpl {
conf.getSchemaRatisConsensusInitialSleepTimeMs())
.setClientRetryMaxSleepTimeMs(
conf.getSchemaRatisConsensusMaxSleepTimeMs())
- .setTriggerSnapshotFileSize(
- conf.getSchemaRatisLogMaxMB() * 1024 * 1024)
+ .setTriggerSnapshotFileSize(conf.getSchemaRatisLogMax())
.build())
.build())
.setStorageDir(conf.getSchemaRegionConsensusDir())