You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/11/29 02:57:46 UTC
[iotdb] branch rel/1.0 updated: [To rel/1.0] Simplify IoTDBCustomRegionGroupExtensionIT (#8232)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.0 by this push:
new 50e969b07a [To rel/1.0] Simplify IoTDBCustomRegionGroupExtensionIT (#8232)
50e969b07a is described below
commit 50e969b07a50edcffdd60edeb10e22ebd5a8a23b
Author: YongzaoDan <33...@users.noreply.github.com>
AuthorDate: Tue Nov 29 10:57:41 2022 +0800
[To rel/1.0] Simplify IoTDBCustomRegionGroupExtensionIT (#8232)
---
.../org/apache/iotdb/confignode/manager/ClusterSchemaManager.java | 3 ++-
.../confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java | 7 +++----
...roupExtensionIT.java => IoTDBCustomRegionGroupExtensionIT.java} | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
index 85e1b8475e..49f1254cd0 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
@@ -153,7 +153,8 @@ public class ClusterSchemaManager {
return result;
}
- public TSStatus deleteStorageGroup(DeleteStorageGroupPlan deleteStorageGroupPlan) {
+ /** Delete StorageGroup synchronized to protect the safety of adjustMaxRegionGroupNum */
+ public synchronized TSStatus deleteStorageGroup(DeleteStorageGroupPlan deleteStorageGroupPlan) {
TSStatus result = getConsensusManager().write(deleteStorageGroupPlan).getStatus();
// Adjust the maximum RegionGroup number of each StorageGroup after deleting the storage group
if (result.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java
index 436fa94611..d35205f274 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBAutoRegionGroupExtensionIT.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.confignode.it.partition;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
-import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.confignode.it.utils.ConfigNodeTestUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeInfo;
@@ -32,6 +31,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
+import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.it.env.ConfigFactory;
import org.apache.iotdb.it.env.EnvFactory;
@@ -49,7 +49,6 @@ import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import java.io.IOException;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
@@ -130,7 +129,7 @@ public class IoTDBAutoRegionGroupExtensionIT {
client.deleteStorageGroup(new TDeleteStorageGroupReq(curSg));
}
boolean isAllRegionGroupDeleted = false;
- for (int retry = 0; retry < 100; retry++) {
+ for (int retry = 0; retry < retryNum; retry++) {
TShowRegionResp showRegionResp = client.showRegion(new TShowRegionReq());
if (showRegionResp.getRegionInfoListSize() == 0) {
isAllRegionGroupDeleted = true;
@@ -159,7 +158,7 @@ public class IoTDBAutoRegionGroupExtensionIT {
String curSg = sg + i;
/* Insert a DataPartition to create DataRegionGroups */
- Map<String, Map<TSeriesPartitionSlot, List<TTimePartitionSlot>>> partitionSlotsMap =
+ Map<String, Map<TSeriesPartitionSlot, TTimeSlotList>> partitionSlotsMap =
ConfigNodeTestUtils.constructPartitionSlotsMap(
curSg, 0, 10, 0, 10, originalTimePartitionInterval);
TDataPartitionTableResp dataPartitionTableResp =
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBRegionGroupExtensionIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBCustomRegionGroupExtensionIT.java
similarity index 97%
rename from integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBRegionGroupExtensionIT.java
rename to integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBCustomRegionGroupExtensionIT.java
index e61f8c5316..4762deffe8 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBRegionGroupExtensionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBCustomRegionGroupExtensionIT.java
@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicInteger;
@RunWith(IoTDBTestRunner.class)
@Category({ClusterIT.class})
-public class IoTDBRegionGroupExtensionIT {
+public class IoTDBCustomRegionGroupExtensionIT {
private static final BaseConfig CONF = ConfigFactory.getConfig();
@@ -63,7 +63,7 @@ public class IoTDBRegionGroupExtensionIT {
private static final String testConsensusProtocolClass = ConsensusFactory.RATIS_CONSENSUS;
private static int originalDataRegionGroupPerDatabase;
- private static final int testDataRegionGroupPerDatabase = 5;
+ private static final int testDataRegionGroupPerDatabase = 2;
private static int originalSchemaReplicationFactor;
private static int originalDataReplicationFactor;
@@ -72,7 +72,7 @@ public class IoTDBRegionGroupExtensionIT {
private static long originalTimePartitionInterval;
private static final String sg = "root.sg";
- private static final int testSgNum = 5;
+ private static final int testSgNum = 2;
@Before
public void setUp() throws Exception {