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/11/25 12:23:50 UTC
[iotdb] 01/01: change more places for name
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch rename_metric_multileader
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit aa57750a279b7d7732d4ab2b40304f0d0f5089da
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Fri Nov 25 20:13:21 2022 +0800
change more places for name
---
.../iotdb/confignode/procedure/env/DataNodeRemoveHandler.java | 2 +-
.../src/test/resources/confignode1conf/iotdb-common.properties | 2 +-
.../src/test/resources/confignode2conf/iotdb-common.properties | 2 +-
.../src/test/resources/confignode3conf/iotdb-common.properties | 2 +-
node-commons/src/assembly/resources/conf/iotdb-common.properties | 8 ++++----
.../src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
index d1aeccaeab..0b1f40564b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/DataNodeRemoveHandler.java
@@ -579,7 +579,7 @@ public class DataNodeRemoveHandler {
.changeLeaderForIoTConsensus(regionId, newLeaderNode.get().getDataNodeId());
LOGGER.info(
- "{}, Change region leader finished for MULTI_LEADER_CONSENSUS, regionId: {}, newLeaderNode: {}",
+ "{}, Change region leader finished for IOT_CONSENSUS, regionId: {}, newLeaderNode: {}",
REMOVE_DATANODE_PROCESS,
regionId,
newLeaderNode);
diff --git a/confignode/src/test/resources/confignode1conf/iotdb-common.properties b/confignode/src/test/resources/confignode1conf/iotdb-common.properties
index caf36ccdc2..bc77b25874 100644
--- a/confignode/src/test/resources/confignode1conf/iotdb-common.properties
+++ b/confignode/src/test/resources/confignode1conf/iotdb-common.properties
@@ -18,7 +18,7 @@
#
timestamp_precision=ms
-data_region_consensus_protocol_class=org.apache.iotdb.consensus.multileader.MultiLeaderConsensus
+data_region_consensus_protocol_class=org.apache.iotdb.consensus.iot.IoTConsensus
schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
schema_replication_factor=3
data_replication_factor=3
diff --git a/confignode/src/test/resources/confignode2conf/iotdb-common.properties b/confignode/src/test/resources/confignode2conf/iotdb-common.properties
index 2f25f57537..1e431a85af 100644
--- a/confignode/src/test/resources/confignode2conf/iotdb-common.properties
+++ b/confignode/src/test/resources/confignode2conf/iotdb-common.properties
@@ -18,7 +18,7 @@
#
timestamp_precision=ms
-data_region_consensus_protocol_class=org.apache.iotdb.consensus.multileader.MultiLeaderConsensus
+data_region_consensus_protocol_class=org.apache.iotdb.consensus.iot.IoTConsensus
schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
schema_replication_factor=3
data_replication_factor=3
diff --git a/confignode/src/test/resources/confignode3conf/iotdb-common.properties b/confignode/src/test/resources/confignode3conf/iotdb-common.properties
index 208d039b7c..e784ec66d3 100644
--- a/confignode/src/test/resources/confignode3conf/iotdb-common.properties
+++ b/confignode/src/test/resources/confignode3conf/iotdb-common.properties
@@ -18,7 +18,7 @@
#
timestamp_precision=ms
-data_region_consensus_protocol_class=org.apache.iotdb.consensus.multileader.MultiLeaderConsensus
+data_region_consensus_protocol_class=org.apache.iotdb.consensus.iot.IoTConsensus
schema_region_consensus_protocol_class=org.apache.iotdb.consensus.ratis.RatisConsensus
schema_replication_factor=3
data_replication_factor=3
diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties b/node-commons/src/assembly/resources/conf/iotdb-common.properties
index 466e3ae065..47580ac8bd 100644
--- a/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -693,15 +693,15 @@
# Datatype: long
# delete_wal_files_period_in_ms=20000
-# The minimum size of wal files when throttle down in MultiLeader consensus
+# The minimum size of wal files when throttle down in IoTConsensus
# If it's a value smaller than 0, use the default value 50 * 1024 * 1024 * 1024 bytes (50GB).
# Datatype: long
-# multi_leader_throttle_threshold_in_byte=53687091200
+# iot_consensus_throttle_threshold_in_byte=53687091200
-# Maximum wait time of write cache in MultiLeader consensus
+# Maximum wait time of write cache in IoTConsensus
# If this value is less than or equal to 0, use the default value Long.MAX_VALUE.
# Datatype: long
-# multi_leader_cache_window_time_in_ms=-1
+# iot_consensus_cache_window_time_in_ms=-1
####################
### TsFile Configurations
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 8e85b4eacf..33357646bf 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
@@ -1146,7 +1146,7 @@ public class IoTDBDescriptor {
long throttleDownThresholdInByte =
Long.parseLong(
properties.getProperty(
- "multi_leader_throttle_threshold_in_byte",
+ "iot_consensus_throttle_threshold_in_byte",
Long.toString(conf.getThrottleThreshold())));
if (throttleDownThresholdInByte > 0) {
conf.setThrottleThreshold(throttleDownThresholdInByte);
@@ -1155,7 +1155,7 @@ public class IoTDBDescriptor {
long cacheWindowInMs =
Long.parseLong(
properties.getProperty(
- "multi_leader_cache_window_time_in_ms",
+ "iot_consensus_cache_window_time_in_ms",
Long.toString(conf.getCacheWindowTimeInMs())));
if (cacheWindowInMs > 0) {
conf.setCacheWindowTimeInMs(cacheWindowInMs);