This is an automated email from the ASF dual-hosted git repository.
caogaofei 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 2d9a2f07b3 [IOTDB-4074] Allocate SchemaRegion and DataRegion
seperately (#7020)
2d9a2f07b3 is described below
commit 2d9a2f07b30526c7b16bd4007a7588d2481f5f27
Author: Itami Sho <[email protected]>
AuthorDate: Thu Aug 18 11:57:44 2022 +0800
[IOTDB-4074] Allocate SchemaRegion and DataRegion seperately (#7020)
---
.../apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java | 2 ++
.../apache/iotdb/confignode/persistence/partition/PartitionInfo.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
index da94fce128..fd67d72d35 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RegionBalancer.java
@@ -72,6 +72,8 @@ public class RegionBalancer {
List<TDataNodeConfiguration> onlineDataNodes =
getNodeManager().filterDataNodeThroughStatus(NodeStatus.Running);
List<TRegionReplicaSet> allocatedRegions =
getPartitionManager().getAllReplicaSets();
+ allocatedRegions.removeIf(
+ allocateRegion -> allocateRegion.getRegionId().getType() !=
consensusGroupType);
for (Map.Entry<String, Integer> entry : allotmentMap.entrySet()) {
String storageGroup = entry.getKey();
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
index b454aa7750..7aa02188e7 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/partition/PartitionInfo.java
@@ -78,7 +78,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
-import java.util.Vector;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -561,7 +560,7 @@ public class PartitionInfo implements SnapshotProcessor {
* @return All Regions' RegionReplicaSet
*/
public List<TRegionReplicaSet> getAllReplicaSets() {
- List<TRegionReplicaSet> result = new Vector<>();
+ List<TRegionReplicaSet> result = new ArrayList<>();
storageGroupPartitionTables
.values()
.forEach(