This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.2 by this push:
new 33626d7d526 [To rel/1.2] fix parameter schemaRegionPerNode load error
(#10845)
33626d7d526 is described below
commit 33626d7d526956acee0093f7aa62feaadd2f9fbd
Author: YuFengLiu <[email protected]>
AuthorDate: Mon Aug 14 21:40:24 2023 +0800
[To rel/1.2] fix parameter schemaRegionPerNode load error (#10845)
* fix parameter schemaRegionPerNode load error (#10841)
* fix conflict
* fix common.properties
---
.../main/java/org/apache/iotdb/it/env/cluster/MppCommonConfig.java | 6 ++++++
.../org/apache/iotdb/it/env/cluster/MppSharedCommonConfig.java | 7 +++++++
.../java/org/apache/iotdb/it/env/remote/RemoteCommonConfig.java | 4 ++++
.../src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java | 2 ++
.../iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java | 6 ++++--
.../org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java | 2 +-
.../src/assembly/resources/conf/iotdb-common.properties | 1 -
7 files changed, 24 insertions(+), 4 deletions(-)
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppCommonConfig.java
index 4dbc3453fb8..5d1714f6347 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppCommonConfig.java
@@ -357,4 +357,10 @@ public class MppCommonConfig extends MppBaseConfig
implements CommonConfig {
setProperty("data_region_per_data_node",
String.valueOf(dataRegionPerDataNode));
return this;
}
+
+ @Override
+ public CommonConfig setSchemaRegionPerDataNode(double
schemaRegionPerDataNode) {
+ setProperty("schema_region_per_data_node",
String.valueOf(schemaRegionPerDataNode));
+ return this;
+ }
}
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppSharedCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppSharedCommonConfig.java
index b362a02d97b..0b1daea98d3 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppSharedCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/MppSharedCommonConfig.java
@@ -371,4 +371,11 @@ public class MppSharedCommonConfig implements CommonConfig
{
cnConfig.setDataRegionPerDataNode(dataRegionPerDataNode);
return this;
}
+
+ @Override
+ public CommonConfig setSchemaRegionPerDataNode(double
schemaRegionPerDataNode) {
+ dnConfig.setSchemaRegionPerDataNode(schemaRegionPerDataNode);
+ cnConfig.setSchemaRegionPerDataNode(schemaRegionPerDataNode);
+ return this;
+ }
}
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/RemoteCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/RemoteCommonConfig.java
index e181d5e1f73..177b4b1af3d 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/RemoteCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/RemoteCommonConfig.java
@@ -266,4 +266,8 @@ public class RemoteCommonConfig implements CommonConfig {
public CommonConfig setDataRegionPerDataNode(double dataRegionPerDataNode) {
return this;
}
+
+ public CommonConfig setSchemaRegionPerDataNode(double
schemaRegionPerDataNode) {
+ return this;
+ }
}
diff --git
a/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
index 08161c36bc3..df302e79891 100644
---
a/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java
@@ -119,4 +119,6 @@ public interface CommonConfig {
CommonConfig setMaxTsBlockSizeInByte(long maxTsBlockSizeInByte);
CommonConfig setDataRegionPerDataNode(double dataRegionPerDataNode);
+
+ CommonConfig setSchemaRegionPerDataNode(double schemaRegionPerDataNode);
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java
index 7d409d7a5de..aab83d2d481 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableIT.java
@@ -79,6 +79,8 @@ public class IoTDBPartitionDurableIT {
final String d1 = sg + ".d1.s";
private static final int testSeriesPartitionBatchSize = 1;
private static final int testTimePartitionBatchSize = 1;
+
+ private static final int testSchemaRegionPerDataNode = 3;
private static final TEndPoint defaultEndPoint = new TEndPoint("-1", -1);
private static final TDataNodeLocation defaultDataNode =
new TDataNodeLocation(
@@ -99,8 +101,8 @@ public class IoTDBPartitionDurableIT {
.setDataRegionConsensusProtocolClass(testConsensusProtocolClass)
.setSchemaReplicationFactor(testReplicationFactor)
.setDataReplicationFactor(testReplicationFactor)
- .setTimePartitionInterval(testTimePartitionInterval);
-
+ .setTimePartitionInterval(testTimePartitionInterval)
+ .setSchemaRegionPerDataNode(testSchemaRegionPerDataNode);
// Init 1C3D environment
EnvFactory.getEnv().initClusterEnvironment(1, 3);
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 5490b700c36..d89e465d27a 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -238,7 +238,7 @@ public class ConfigNodeDescriptor {
properties
.getProperty(
"schema_region_per_data_node",
- String.valueOf(conf.getSchemaReplicationFactor()))
+ String.valueOf(conf.getSchemaRegionPerDataNode()))
.trim()));
conf.setDataRegionGroupExtensionPolicy(
diff --git
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
index cce12379ec6..22b9083f14e 100644
---
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++
b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -102,7 +102,6 @@ cluster_name=defaultCluster
# This parameter is the maximum number of SchemaRegions expected to be managed
by each DataNode.
# Notice: Since each Database requires at least one SchemaRegionGroup to
manage its schema,
# this parameter doesn't limit the upper bound of cluster SchemaRegions when
there are too many Databases.
-# Default is equal to the schema_replication_factor to ensure each DataNode
will have a SchemaRegionGroupLeader.
# Datatype: Double
# schema_region_per_data_node=1.0
