This is an automated email from the ASF dual-hosted git repository.
JackieTien97 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 b9d3dbe9123 Remove IoTConsensus auto leader balance toggle (#17950)
b9d3dbe9123 is described below
commit b9d3dbe91232e7cd769e317b66f94a2086fbda38
Author: Yongzao <[email protected]>
AuthorDate: Tue Jun 16 16:42:19 2026 +0800
Remove IoTConsensus auto leader balance toggle (#17950)
---
.../apache/iotdb/it/env/cluster/config/MppCommonConfig.java | 9 ---------
.../iotdb/it/env/cluster/config/MppSharedCommonConfig.java | 8 --------
.../iotdb/it/env/remote/config/RemoteCommonConfig.java | 6 ------
.../main/java/org/apache/iotdb/itbase/env/CommonConfig.java | 3 ---
.../it/load/IoTDBMultiDBRegionGroupLeaderDistributionIT.java | 1 -
.../it/load/IoTDBPerDatabaseRegionGroupAllocationIT.java | 8 +++++---
.../it/load/IoTDBRegionGroupLeaderDistributionIT.java | 1 -
.../org/apache/iotdb/confignode/conf/ConfigNodeConfig.java | 12 ------------
.../apache/iotdb/confignode/conf/ConfigNodeDescriptor.java | 6 ------
.../confignode/manager/load/balancer/RouteBalancer.java | 9 +++------
.../assembly/resources/conf/iotdb-system.properties.template | 7 -------
11 files changed, 8 insertions(+), 62 deletions(-)
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
index c7ff02002dc..064cfe1e2b2 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java
@@ -351,15 +351,6 @@ public class MppCommonConfig extends MppBaseConfig
implements CommonConfig {
return this;
}
- @Override
- public CommonConfig setEnableAutoLeaderBalanceForIoTConsensus(
- boolean enableAutoLeaderBalanceForIoTConsensus) {
- setProperty(
- "enable_auto_leader_balance_for_iot_consensus",
- String.valueOf(enableAutoLeaderBalanceForIoTConsensus));
- return this;
- }
-
@Override
public CommonConfig setQueryThreadCount(int queryThreadCount) {
if (queryThreadCount <= 0) {
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
index 5ed27b2f502..777d978f26d 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java
@@ -353,14 +353,6 @@ public class MppSharedCommonConfig implements CommonConfig
{
return this;
}
- @Override
- public CommonConfig setEnableAutoLeaderBalanceForIoTConsensus(
- boolean enableAutoLeaderBalanceForIoTConsensus) {
-
cnConfig.setEnableAutoLeaderBalanceForIoTConsensus(enableAutoLeaderBalanceForIoTConsensus);
-
dnConfig.setEnableAutoLeaderBalanceForIoTConsensus(enableAutoLeaderBalanceForIoTConsensus);
- return this;
- }
-
@Override
public CommonConfig setQueryThreadCount(int queryThreadCount) {
cnConfig.setQueryThreadCount(queryThreadCount);
diff --git
a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
index 03948e2371f..67a74dfe02e 100644
---
a/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
+++
b/integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java
@@ -248,12 +248,6 @@ public class RemoteCommonConfig implements CommonConfig {
return this;
}
- @Override
- public CommonConfig setEnableAutoLeaderBalanceForIoTConsensus(
- boolean enableAutoLeaderBalanceForIoTConsensus) {
- return this;
- }
-
@Override
public CommonConfig setQueryThreadCount(int queryThreadCount) {
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 ad9168faebf..09b767dd545 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
@@ -113,9 +113,6 @@ public interface CommonConfig {
CommonConfig setEnableAutoLeaderBalanceForRatisConsensus(
boolean enableAutoLeaderBalanceForRatisConsensus);
- CommonConfig setEnableAutoLeaderBalanceForIoTConsensus(
- boolean enableAutoLeaderBalanceForIoTConsensus);
-
CommonConfig setQueryThreadCount(int queryThreadCount);
CommonConfig setWalBufferSize(int walBufferSize);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBMultiDBRegionGroupLeaderDistributionIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBMultiDBRegionGroupLeaderDistributionIT.java
index bb6de6c11cf..9da95d20b51 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBMultiDBRegionGroupLeaderDistributionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBMultiDBRegionGroupLeaderDistributionIT.java
@@ -71,7 +71,6 @@ public class IoTDBMultiDBRegionGroupLeaderDistributionIT {
EnvFactory.getEnv()
.getConfig()
.getCommonConfig()
- .setEnableAutoLeaderBalanceForIoTConsensus(true)
.setDataReplicationFactor(TEST_REPLICATION_FACTOR)
.setDataRegionConsensusProtocolClass(TEST_DATA_REGION_CONSENSUS_PROTOCOL_CLASS);
EnvFactory.getEnv().initClusterEnvironment(1, TEST_DATA_NODE_NUM);
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBPerDatabaseRegionGroupAllocationIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBPerDatabaseRegionGroupAllocationIT.java
index 94b67fa8f53..cbcd9621d54 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBPerDatabaseRegionGroupAllocationIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBPerDatabaseRegionGroupAllocationIT.java
@@ -79,9 +79,7 @@ public class IoTDBPerDatabaseRegionGroupAllocationIT {
.setDataRegionConsensusProtocolClass(ConsensusFactory.IOT_CONSENSUS)
.setDataReplicationFactor(TEST_REPLICATION_FACTOR)
.setDataRegionGroupExtensionPolicy("CUSTOM")
-
.setDefaultDataRegionGroupNumPerDatabase(TEST_DATA_REGION_GROUP_NUM_PER_DATABASE)
- // Avoid auto leader balancing rearranging anything during the test
- .setEnableAutoLeaderBalanceForIoTConsensus(false);
+
.setDefaultDataRegionGroupNumPerDatabase(TEST_DATA_REGION_GROUP_NUM_PER_DATABASE);
EnvFactory.getEnv().initClusterEnvironment(1, TEST_DATA_NODE_NUM);
}
@@ -128,6 +126,10 @@ public class IoTDBPerDatabaseRegionGroupAllocationIT {
TDataPartitionTableResp dataPartitionTableResp =
client.getOrCreateDataPartitionTable(new
TDataPartitionReq(partitionSlotsMap));
Assert.assertEquals(
+ "Failed to create DataPartitions for "
+ + currentDatabase
+ + ": "
+ + dataPartitionTableResp.getStatus(),
TSStatusCode.SUCCESS_STATUS.getStatusCode(),
dataPartitionTableResp.getStatus().getCode());
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBRegionGroupLeaderDistributionIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBRegionGroupLeaderDistributionIT.java
index 5be59962be5..fc0b73d6e1c 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBRegionGroupLeaderDistributionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/load/IoTDBRegionGroupLeaderDistributionIT.java
@@ -73,7 +73,6 @@ public class IoTDBRegionGroupLeaderDistributionIT {
.getConfig()
.getCommonConfig()
.setEnableAutoLeaderBalanceForRatisConsensus(true)
- .setEnableAutoLeaderBalanceForIoTConsensus(true)
.setSchemaRegionConsensusProtocolClass(TEST_SCHEMA_REGION_CONSENSUS_PROTOCOL_CLASS)
.setDataRegionConsensusProtocolClass(TEST_DATA_REGION_CONSENSUS_PROTOCOL_CLASS)
.setSchemaReplicationFactor(TEST_REPLICATION_FACTOR)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index 051a7fc31f7..326d8b43ceb 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -231,9 +231,6 @@ public class ConfigNodeConfig {
/** Whether to enable auto leader balance for Ratis consensus protocol. */
private boolean enableAutoLeaderBalanceForRatisConsensus = true;
- /** Whether to enable auto leader balance for IoTConsensus protocol. */
- private boolean enableAutoLeaderBalanceForIoTConsensus = true;
-
/** The route priority policy of cluster read/write requests. */
private String routePriorityPolicy = IPriorityBalancer.LEADER_POLICY;
@@ -752,15 +749,6 @@ public class ConfigNodeConfig {
this.enableAutoLeaderBalanceForRatisConsensus =
enableAutoLeaderBalanceForRatisConsensus;
}
- public boolean isEnableAutoLeaderBalanceForIoTConsensus() {
- return enableAutoLeaderBalanceForIoTConsensus;
- }
-
- public void setEnableAutoLeaderBalanceForIoTConsensus(
- boolean enableAutoLeaderBalanceForIoTConsensus) {
- this.enableAutoLeaderBalanceForIoTConsensus =
enableAutoLeaderBalanceForIoTConsensus;
- }
-
public String getRoutePriorityPolicy() {
return routePriorityPolicy;
}
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 c23620f9e75..1245bef7f3d 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
@@ -386,12 +386,6 @@ public class ConfigNodeDescriptor {
"enable_auto_leader_balance_for_ratis_consensus",
String.valueOf(conf.isEnableAutoLeaderBalanceForRatisConsensus()))));
- conf.setEnableAutoLeaderBalanceForIoTConsensus(
- Boolean.parseBoolean(
- properties.getProperty(
- "enable_auto_leader_balance_for_iot_consensus",
-
String.valueOf(conf.isEnableAutoLeaderBalanceForIoTConsensus()))));
-
String routePriorityPolicy =
properties.getProperty("route_priority_policy",
conf.getRoutePriorityPolicy());
if (IPriorityBalancer.GREEDY_POLICY.equals(routePriorityPolicy)
diff --git
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
index 5429727f77b..63575a9a2c1 100644
---
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
+++
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
@@ -88,17 +88,14 @@ public class RouteBalancer implements
IClusterStatusSubscriber {
private static final boolean IS_ENABLE_AUTO_LEADER_BALANCE_FOR_DATA_REGION =
(CONF.isEnableAutoLeaderBalanceForRatisConsensus()
&&
ConsensusFactory.RATIS_CONSENSUS.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS))
- || (CONF.isEnableAutoLeaderBalanceForIoTConsensus()
- &&
ConsensusFactory.IOT_CONSENSUS.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS))
- || (CONF.isEnableAutoLeaderBalanceForIoTConsensus()
- &&
ConsensusFactory.IOT_CONSENSUS_V2.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS))
+ ||
ConsensusFactory.IOT_CONSENSUS.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS)
+ ||
ConsensusFactory.IOT_CONSENSUS_V2.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS)
// The simple consensus protocol will always automatically designate
itself as the leader
||
ConsensusFactory.SIMPLE_CONSENSUS.equals(DATA_REGION_CONSENSUS_PROTOCOL_CLASS);
private static final boolean IS_ENABLE_AUTO_LEADER_BALANCE_FOR_SCHEMA_REGION
=
(CONF.isEnableAutoLeaderBalanceForRatisConsensus()
&&
ConsensusFactory.RATIS_CONSENSUS.equals(SCHEMA_REGION_CONSENSUS_PROTOCOL_CLASS))
- || (CONF.isEnableAutoLeaderBalanceForIoTConsensus()
- &&
ConsensusFactory.IOT_CONSENSUS.equals(SCHEMA_REGION_CONSENSUS_PROTOCOL_CLASS))
+ ||
ConsensusFactory.IOT_CONSENSUS.equals(SCHEMA_REGION_CONSENSUS_PROTOCOL_CLASS)
// The simple consensus protocol will always automatically designate
itself as the leader
||
ConsensusFactory.SIMPLE_CONSENSUS.equals(SCHEMA_REGION_CONSENSUS_PROTOCOL_CLASS);
private static final long REGION_PRIORITY_WAITING_TIMEOUT =
diff --git
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
index 8e762c0840c..14f3773e9f7 100644
---
a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
+++
b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template
@@ -695,13 +695,6 @@ region_group_allocate_policy=GCR
# Datatype: Boolean
enable_auto_leader_balance_for_ratis_consensus=true
-# Whether to enable auto leader balance for IoTConsensus protocol.
-# The ConfigNode-leader will balance the leader of IoTConsensus-RegionGroups
by leader_distribution_policy if set true.
-# Notice: Default is true because the IoTConsensus depends on this function to
distribute leader.
-# effectiveMode: restart
-# Datatype: Boolean
-enable_auto_leader_balance_for_iot_consensus=true
-
####################
### Cluster management
####################
