Skip to content

[remove datanode] Fix IoTDBRemoveDataNodeNormalIT #15429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OneSizeFitsQuorum merged 1 commit into from
Apr 28, 2025
Merged

[remove datanode] Fix IoTDBRemoveDataNodeNormalIT #15429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...ache/iotdb/confignode/manager/load/balancer/region/GreedyCopySetRegionGroupAllocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,7 @@ public Map<TConsensusGroupId, TDataNodeConfiguration> removeNodeReplicaSelect(
try {
// 1. prepare: compute regionCounter, databaseRegionCounter, and combinationCounter

List<TRegionReplicaSet> databaseAllocatedRegionGroups =
new ArrayList<>(databaseAllocatedRegionGroupMap.values()).get(0);
prepare(availableDataNodeMap, allocatedRegionGroups, databaseAllocatedRegionGroups);
prepare(availableDataNodeMap, allocatedRegionGroups, Collections.emptyList());
computeInitialDbLoad(databaseAllocatedRegionGroupMap);

// 2. Build allowed candidate set for each region that needs to be migrated.
Expand Down
8 changes: 4 additions & 4 deletions ...ignode/src/main/java/org/apache/iotdb/confignode/procedure/env/RemoveDataNodeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.apache.iotdb.confignode.consensus.request.write.datanode.RemoveDataNodePlan;
import org.apache.iotdb.confignode.consensus.response.datanode.DataNodeToStatusResp;
import org.apache.iotdb.confignode.manager.ConfigManager;
import org.apache.iotdb.confignode.manager.load.balancer.region.GreedyRegionGroupAllocator;
import org.apache.iotdb.confignode.manager.load.balancer.region.GreedyCopySetRegionGroupAllocator;
import org.apache.iotdb.confignode.manager.load.balancer.region.IRegionGroupAllocator;
import org.apache.iotdb.confignode.manager.load.cache.node.NodeHeartbeatSample;
import org.apache.iotdb.confignode.manager.load.cache.region.RegionHeartbeatSample;
Expand Down Expand Up @@ -83,14 +83,14 @@ public RemoveDataNodeHandler(ConfigManager configManager) {

switch (ConfigNodeDescriptor.getInstance().getConf().getRegionGroupAllocatePolicy()) {
case GREEDY:
this.regionGroupAllocator = new GreedyRegionGroupAllocator();
this.regionGroupAllocator = new GreedyCopySetRegionGroupAllocator();
break;
case PGR:
this.regionGroupAllocator = new GreedyRegionGroupAllocator();
this.regionGroupAllocator = new GreedyCopySetRegionGroupAllocator();
break;
case GCR:
default:
this.regionGroupAllocator = new GreedyRegionGroupAllocator();
this.regionGroupAllocator = new GreedyCopySetRegionGroupAllocator();
}
}

Expand Down
Loading