Skip to content

Commit 9537806

Browse files
authored
[remove datanode] Fix IoTDBRemoveDataNodeNormalIT apache#15429
1 parent 4af9c59 commit 9537806

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/GreedyCopySetRegionGroupAllocator.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,7 @@ public Map<TConsensusGroupId, TDataNodeConfiguration> removeNodeReplicaSelect(
138138
try {
139139
// 1. prepare: compute regionCounter, databaseRegionCounter, and combinationCounter
140140

141-
List<TRegionReplicaSet> databaseAllocatedRegionGroups =
142-
new ArrayList<>(databaseAllocatedRegionGroupMap.values()).get(0);
143-
prepare(availableDataNodeMap, allocatedRegionGroups, databaseAllocatedRegionGroups);
141+
prepare(availableDataNodeMap, allocatedRegionGroups, Collections.emptyList());
144142
computeInitialDbLoad(databaseAllocatedRegionGroupMap);
145143

146144
// 2. Build allowed candidate set for each region that needs to be migrated.

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/env/RemoveDataNodeHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.apache.iotdb.confignode.consensus.request.write.datanode.RemoveDataNodePlan;
3939
import org.apache.iotdb.confignode.consensus.response.datanode.DataNodeToStatusResp;
4040
import org.apache.iotdb.confignode.manager.ConfigManager;
41-
import org.apache.iotdb.confignode.manager.load.balancer.region.GreedyRegionGroupAllocator;
41+
import org.apache.iotdb.confignode.manager.load.balancer.region.GreedyCopySetRegionGroupAllocator;
4242
import org.apache.iotdb.confignode.manager.load.balancer.region.IRegionGroupAllocator;
4343
import org.apache.iotdb.confignode.manager.load.cache.node.NodeHeartbeatSample;
4444
import org.apache.iotdb.confignode.manager.load.cache.region.RegionHeartbeatSample;
@@ -83,14 +83,14 @@ public RemoveDataNodeHandler(ConfigManager configManager) {
8383

8484
switch (ConfigNodeDescriptor.getInstance().getConf().getRegionGroupAllocatePolicy()) {
8585
case GREEDY:
86-
this.regionGroupAllocator = new GreedyRegionGroupAllocator();
86+
this.regionGroupAllocator = new GreedyCopySetRegionGroupAllocator();
8787
break;
8888
case PGR:
89-
this.regionGroupAllocator = new GreedyRegionGroupAllocator();
89+
this.regionGroupAllocator = new GreedyCopySetRegionGroupAllocator();
9090
break;
9191
case GCR:
9292
default:
93-
this.regionGroupAllocator = new GreedyRegionGroupAllocator();
93+
this.regionGroupAllocator = new GreedyCopySetRegionGroupAllocator();
9494
}
9595
}
9696

0 commit comments

Comments
 (0)