You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/06/17 13:04:01 UTC
[iotdb] branch master updated: Accelerate New Cluster IT (#6326)
This is an automated email from the ASF dual-hosted git repository.
jackietien 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 e269bb7a83 Accelerate New Cluster IT (#6326)
e269bb7a83 is described below
commit e269bb7a8374dd1daee15651773a746ca5d66b7b
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Fri Jun 17 21:03:55 2022 +0800
Accelerate New Cluster IT (#6326)
---
.../org/apache/iotdb/confignode/conf/ConfigNodeConfig.java | 6 +++++-
.../apache/iotdb/confignode/conf/ConfigNodeDescriptor.java | 4 ++++
.../src/main/java/org/apache/iotdb/it/env/Cluster1Env.java | 4 ++--
.../src/main/java/org/apache/iotdb/it/env/ClusterEnvBase.java | 5 +++--
.../src/main/java/org/apache/iotdb/it/env/ConfigNode.java | 11 +++++++----
.../iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java | 5 ++++-
.../java/org/apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java | 3 +++
7 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index 47fb03c2d2..796c2e466c 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -56,7 +56,7 @@ public class ConfigNodeConfig {
private int connectionTimeoutInMS = (int) TimeUnit.SECONDS.toMillis(20);
/** ConfigNodeGroup consensus protocol */
- private final String configNodeConsensusProtocolClass = ConsensusFactory.RatisConsensus;
+ private String configNodeConsensusProtocolClass = ConsensusFactory.RatisConsensus;
/** DataNode data region consensus protocol */
private String dataRegionConsensusProtocolClass = ConsensusFactory.StandAloneConsensus;
@@ -319,6 +319,10 @@ public class ConfigNodeConfig {
return configNodeConsensusProtocolClass;
}
+ public void setConfigNodeConsensusProtocolClass(String configNodeConsensusProtocolClass) {
+ this.configNodeConsensusProtocolClass = configNodeConsensusProtocolClass;
+ }
+
public String getDataRegionConsensusProtocolClass() {
return dataRegionConsensusProtocolClass;
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 28305194c4..98d8abbc3f 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -129,6 +129,10 @@ public class ConfigNodeDescriptor {
properties.getProperty(
"series_partition_executor_class", conf.getSeriesPartitionExecutorClass()));
+ conf.setConfigNodeConsensusProtocolClass(
+ properties.getProperty(
+ "config_node_consensus_protocol_class", conf.getConfigNodeConsensusProtocolClass()));
+
conf.setDataRegionConsensusProtocolClass(
properties.getProperty(
"data_region_consensus_protocol_class", conf.getDataRegionConsensusProtocolClass()));
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/Cluster1Env.java b/integration-test/src/main/java/org/apache/iotdb/it/env/Cluster1Env.java
index 7cf0cf3878..74029997c5 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/Cluster1Env.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/Cluster1Env.java
@@ -27,12 +27,12 @@ public class Cluster1Env extends ClusterEnvBase {
@Override
public void initBeforeClass() throws InterruptedException {
logger.debug("=======start init class=======");
- super.initEnvironment(3, 3);
+ super.initEnvironment(1, 3);
}
@Override
public void initBeforeTest() throws InterruptedException {
logger.debug("=======start init test=======");
- super.initEnvironment(3, 3);
+ super.initEnvironment(1, 3);
}
}
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/ClusterEnvBase.java b/integration-test/src/main/java/org/apache/iotdb/it/env/ClusterEnvBase.java
index 6f1dd50019..bcd2fba58c 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/ClusterEnvBase.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/ClusterEnvBase.java
@@ -38,6 +38,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Random;
+import java.util.concurrent.TimeUnit;
import static org.apache.iotdb.jdbc.Config.VERSION;
import static org.junit.Assert.fail;
@@ -127,10 +128,10 @@ public abstract class ClusterEnvBase implements BaseEnv {
public void testWorking() throws InterruptedException {
int counter = 0;
- Thread.sleep(2000);
+ TimeUnit.SECONDS.sleep(2);
do {
- Thread.sleep(1000);
+ TimeUnit.SECONDS.sleep(1);
counter++;
if (counter > 30) {
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNode.java b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNode.java
index a6f2d49e5d..f2461568f9 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNode.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNode.java
@@ -99,14 +99,17 @@ public class ConfigNode extends ClusterNodeBase {
configProperties.setProperty("rpc_port", String.valueOf(super.getPort()));
configProperties.setProperty("consensus_port", String.valueOf(this.consensusPort));
configProperties.setProperty("target_confignode", this.targetConfigNode);
+ configProperties.setProperty(
+ "config_node_consensus_protocol_class",
+ "org.apache.iotdb.consensus.standalone.StandAloneConsensus");
configProperties.setProperty(
"schema_region_consensus_protocol_class",
- "org.apache.iotdb.consensus.ratis.RatisConsensus");
+ "org.apache.iotdb.consensus.standalone.StandAloneConsensus");
configProperties.setProperty(
"data_region_consensus_protocol_class",
- "org.apache.iotdb.consensus.ratis.RatisConsensus");
- configProperties.setProperty("schema_replication_factor", "2");
- configProperties.setProperty("data_replication_factor", "2");
+ "org.apache.iotdb.consensus.standalone.StandAloneConsensus");
+ configProperties.setProperty("schema_replication_factor", "1");
+ configProperties.setProperty("data_replication_factor", "1");
configProperties.setProperty("connection_timeout_ms", "30000");
if (properties != null && !properties.isEmpty()) {
configProperties.putAll(properties);
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java
index a9268b0d17..057523e335 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBInsertAlignedValuesIT.java
@@ -246,6 +246,7 @@ public class IoTDBInsertAlignedValuesIT {
fail();
} catch (SQLException e) {
assertTrue(
+ e.getMessage(),
e.getMessage()
.contains(
"the measurementList's size 2 is not consistent with the valueList's size 3"));
@@ -285,7 +286,9 @@ public class IoTDBInsertAlignedValuesIT {
"insert into root.t1.wf01.wt01(time, s3, status, status) aligned values(100, true, 20.1, 20.2)");
fail();
} catch (SQLException e) {
- assertTrue(e.getMessage().contains("Insertion contains duplicated measurement: status"));
+ assertTrue(
+ e.getMessage(),
+ e.getMessage().contains("Insertion contains duplicated measurement: status"));
}
}
}
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java
index 7f5405214d..e540b24f9c 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDFManagementIT.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.itbase.category.LocalStandaloneIT;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
@@ -237,6 +238,8 @@ public class IoTDBUDFManagementIT {
}
}
+ // TODO remove @Ignore while completely supportting udf in new cluster
+ @Ignore
@Test
public void testDropBuiltInFunction() throws SQLException { // drop
try (Connection connection = EnvFactory.getEnv().getConnection();