(iotdb) branch region-multi-database updated: debug GCS

[yongzao]

This is an automated email from the ASF dual-hosted git repository.

yongzao pushed a commit to branch region-multi-database
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/region-multi-database by this 
push:
     new cb020bf30a4 debug GCS
cb020bf30a4 is described below

commit cb020bf30a4541b045753340fcff2f1d235c8978
Author: YongzaoDan <532741...@qq.com>
AuthorDate: Sat Mar 9 10:45:08 2024 +0800

    debug GCS
---
 .../load/balancer/region/GreedyCopySetRegionGroupAllocator.java   | 8 +++-----
 .../RegionAllocatorAndLeaderBalancerCombinatorialManualTest.java  | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/GreedyCopySetRegionGroupAllocator.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/GreedyCopySetRegionGroupAllocator.java
index 6092fa48f0c..3066f64d38c 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/GreedyCopySetRegionGroupAllocator.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/region/GreedyCopySetRegionGroupAllocator.java
@@ -127,10 +127,6 @@ public class GreedyCopySetRegionGroupAllocator implements 
IRegionGroupAllocator
         
result.addToDataNodeLocations(availableDataNodeMap.get(optimalReplicaSet[i]).getLocation());
       }
 
-      if (optimalCombinationSum > 0) {
-        System.out.println("The optimal combination sum is " + 
optimalCombinationSum);
-      }
-
       return result;
     } finally {
       clear();
@@ -276,7 +272,9 @@ public class GreedyCopySetRegionGroupAllocator implements 
IRegionGroupAllocator
         optimalCombinationSum = combinationSum;
         optimalReplicaSets.clear();
       }
-      optimalReplicaSets.add(Arrays.copyOf(currentReplicaSet, 
replicationFactor));
+      if (combinationSum == optimalCombinationSum) {
+        optimalReplicaSets.add(Arrays.copyOf(currentReplicaSet, 
replicationFactor));
+      }
       return;
     }
 
diff --git 
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/RegionAllocatorAndLeaderBalancerCombinatorialManualTest.java
 
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/RegionAllocatorAndLeaderBalancerCombinatorialManualTest.java
index d68d775d302..d8822f33079 100644
--- 
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/RegionAllocatorAndLeaderBalancerCombinatorialManualTest.java
+++ 
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/manager/load/balancer/RegionAllocatorAndLeaderBalancerCombinatorialManualTest.java
@@ -7,8 +7,8 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
 import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
 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.balancer.router.leader.GreedyLeaderBalancer;
 import 
org.apache.iotdb.confignode.manager.load.balancer.router.leader.ILeaderBalancer;
+import 
org.apache.iotdb.confignode.manager.load.balancer.router.leader.MinCostFlowLeaderBalancer;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -31,8 +31,8 @@ public class 
RegionAllocatorAndLeaderBalancerCombinatorialManualTest {
       
LoggerFactory.getLogger(RegionAllocatorAndLeaderBalancerCombinatorialManualTest.class);
 
   private static final int TEST_LOOP = 1;
-  private static final int TEST_DATA_NODE_NUM = 9;
-  private static final int DATA_REGION_PER_DATA_NODE = 6;
+  private static final int TEST_DATA_NODE_NUM = 100;
+  private static final int DATA_REGION_PER_DATA_NODE = 4;
   private static final int DATA_REPLICATION_FACTOR = 3;
   private static final String DATABASE = "root.db";
 
@@ -43,7 +43,7 @@ public class 
RegionAllocatorAndLeaderBalancerCombinatorialManualTest {
   private static final IRegionGroupAllocator ALLOCATOR = new 
GreedyCopySetRegionGroupAllocator();
   //      new TieredReplicationAllocator(
   //          TEST_DATA_NODE_NUM, DATA_REPLICATION_FACTOR, 
DATA_REGION_PER_DATA_NODE);
-  private static final ILeaderBalancer BALANCER = new GreedyLeaderBalancer();
+  private static final ILeaderBalancer BALANCER = new 
MinCostFlowLeaderBalancer();
 
   @BeforeClass
   public static void setUp() {