This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/cluster by this push:
new 678c648 modify startup script
678c648 is described below
commit 678c6488e6bcffb30e6592c99529a79ef4afc2d5
Author: lta <[email protected]>
AuthorDate: Fri Apr 5 17:12:25 2019 +0800
modify startup script
---
.../cluster/config/ClusterDescriptorTest.java | 12 ++++++++---
iotdb/iotdb/bin/start-cluster.bat | 1 +
iotdb/iotdb/bin/start-cluster.sh | 1 +
iotdb/iotdb/conf/iotdb-cluster.properties | 6 +++---
iotdb/iotdb/conf/iotdb-engine.properties | 2 --
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 23 ++++++----------------
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 5 ++++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 21 +++++++++++---------
.../org/apache/iotdb/db/service/JDBCService.java | 2 +-
9 files changed, 37 insertions(+), 36 deletions(-)
diff --git
a/cluster/src/test/java/org/apache/iotdb/cluster/config/ClusterDescriptorTest.java
b/cluster/src/test/java/org/apache/iotdb/cluster/config/ClusterDescriptorTest.java
index 2c5662f..abbb827 100644
---
a/cluster/src/test/java/org/apache/iotdb/cluster/config/ClusterDescriptorTest.java
+++
b/cluster/src/test/java/org/apache/iotdb/cluster/config/ClusterDescriptorTest.java
@@ -18,19 +18,19 @@
*/
package org.apache.iotdb.cluster.config;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
-import com.sun.tools.javac.comp.Env;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.cluster.utils.EnvironmentUtils;
import org.apache.iotdb.db.conf.IoTDBConstant;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -99,6 +99,10 @@ public class ClusterDescriptorTest {
}
};
+ static {
+ System.setProperty(IoTDBConstant.IOTDB_TYPE, "CLUSTER");
+ }
+
@Before
public void setUp() throws Exception {
EnvironmentUtils.envSetUp();
@@ -141,6 +145,8 @@ public class ClusterDescriptorTest {
assertEquals(testQueueLenNew, config.getMaxQueueNumOfInnerRpcClient() +
"");
assertEquals(testMetadataConsistencyNew,
config.getReadMetadataConsistencyLevel() + "");
assertEquals(testDataConsistencyNew, config.getReadDataConsistencyLevel()
+ "");
+
assertEquals(IoTDBDescriptor.getInstance().getConfig().getRpcImplClassName(),
+ IoTDBConstant.CLUSTER_RPC_IMPL_CALSS);
System.setProperty(IoTDBConstant.IOTDB_CONF, "");
config.deleteAllPath();
diff --git a/iotdb/iotdb/bin/start-cluster.bat
b/iotdb/iotdb/bin/start-cluster.bat
index 6132850..8728ce3 100755
--- a/iotdb/iotdb/bin/start-cluster.bat
+++ b/iotdb/iotdb/bin/start-cluster.bat
@@ -56,6 +56,7 @@ popd
set IOTDB_CONF=%IOTDB_HOME%\conf
set IOTDB_LOGS=%IOTDB_HOME%\logs
+set IOTDB_TYPE=CLUSTER
IF EXIST "%IOTDB_CONF%\iotdb-env.bat" (
CALL "%IOTDB_CONF%\iotdb-env.bat"
diff --git a/iotdb/iotdb/bin/start-cluster.sh b/iotdb/iotdb/bin/start-cluster.sh
index c057af8..bf41270 100755
--- a/iotdb/iotdb/bin/start-cluster.sh
+++ b/iotdb/iotdb/bin/start-cluster.sh
@@ -28,6 +28,7 @@ if [ -z "${IOTDB_HOME}" ]; then
fi
IOTDB_CONF=${IOTDB_HOME}/conf
+IOTDB_TYPE=CLUSTER
# IOTDB_LOGS=${IOTDB_HOME}/logs
if [ -f "$IOTDB_CONF/iotdb-env.sh" ]; then
diff --git a/iotdb/iotdb/conf/iotdb-cluster.properties
b/iotdb/iotdb/conf/iotdb-cluster.properties
index 664f208..88bd41a 100644
--- a/iotdb/iotdb/conf/iotdb-cluster.properties
+++ b/iotdb/iotdb/conf/iotdb-cluster.properties
@@ -59,10 +59,10 @@ max_num_of_inner_rpc_client = 50;
# Max number of queue length to use inner rpc client, the request which exceed
to this
# number will be rejected.
-max_queue_num_of_inner_rpc_client = 50;
+max_queue_num_of_inner_rpc_client = 50
# ReadMetadataConsistencyLevel: 1 Strong consistency, 2 Weak consistency
-read_metadata_consistency_level = 1;
+read_metadata_consistency_level = 1
# ReadDataConsistencyLevel: 1 Strong consistency, 2 Weak consistency
-read_data_consistency_level = 1;
\ No newline at end of file
+read_data_consistency_level = 1
\ No newline at end of file
diff --git a/iotdb/iotdb/conf/iotdb-engine.properties
b/iotdb/iotdb/conf/iotdb-engine.properties
index 57a9d60..811a6f5 100644
--- a/iotdb/iotdb/conf/iotdb-engine.properties
+++ b/iotdb/iotdb/conf/iotdb-engine.properties
@@ -21,8 +21,6 @@ rpc_address=0.0.0.0
rpc_port=6667
-enable_cluster=true
-
# Write ahead log configuration
# Is write ahead log enable
enable_wal=true
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 41114ab..4bf5ac8 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -276,14 +276,11 @@ public class IoTDBConfig {
* Examining period of cache file reader : 100 seconds.
*/
private long cacheFileReaderClearPeriod = 100000;
- /**
- * Is cluster enable
- */
- private boolean enableCluster = false;
+
/**
* Replace implementation class of JDBC service
*/
- private String jdbcServiceImplClassName = TSServiceImpl.class.getName();
+ private String rpcImplClassName = TSServiceImpl.class.getName();
public IoTDBConfig() {
// empty constructor
@@ -825,19 +822,11 @@ public class IoTDBConfig {
this.cacheFileReaderClearPeriod = cacheFileReaderClearPeriod;
}
- public boolean isEnableCluster() {
- return enableCluster;
- }
-
- public void setEnableCluster(boolean enableCluster) {
- this.enableCluster = enableCluster;
- }
-
- public String getJdbcServiceImplClassName() {
- return jdbcServiceImplClassName;
+ public String getRpcImplClassName() {
+ return rpcImplClassName;
}
- public void setJdbcServiceImplClassName(String jdbcServiceImplClassName) {
- this.jdbcServiceImplClassName = jdbcServiceImplClassName;
+ public void setRpcImplClassName(String rpcImplClassName) {
+ this.rpcImplClassName = rpcImplClassName;
}
}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
index 2919279..0d5aed1 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBConstant.java
@@ -20,7 +20,8 @@ package org.apache.iotdb.db.conf;
public class IoTDBConstant {
- private IoTDBConstant() {}
+ private IoTDBConstant() {
+ }
public static final String ENV_FILE_NAME = "iotdb-env";
public static final String IOTDB_CONF = "IOTDB_CONF";
@@ -34,6 +35,8 @@ public class IoTDBConstant {
public static final String JMX_REMOTE_RMI_PORT =
"com.sun.management.jmxremote.rmi.port";
public static final String IOTDB_PACKAGE = "org.apache.iotdb.service";
public static final String JMX_TYPE = "type";
+ public static final String IOTDB_TYPE = "IOTDB_TYPE";
+ public static final String IOTDB_CLUSTER_TYPE = "CLUSTER";
public static final long GB = 1024 * 1024 * 1024L;
public static final long MB = 1024 * 1024L;
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index e71f9ad..d4a2bee 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -51,6 +51,14 @@ public class IoTDBDescriptor {
*/
private void loadProps() {
InputStream inputStream;
+
+ /** IoTDB Type: Single or Cluster **/
+ String iotdbType = System.getProperty(IoTDBConstant.IOTDB_TYPE, null);
+ if (iotdbType != null &&
iotdbType.equals(IoTDBConstant.IOTDB_CLUSTER_TYPE)) {
+ conf.setRpcImplClassName(IoTDBConstant.CLUSTER_RPC_IMPL_CALSS);
+ conf.setEnableWal(false);
+ }
+
String url = System.getProperty(IoTDBConstant.IOTDB_CONF, null);
if (url == null) {
url = System.getProperty(IoTDBConstant.IOTDB_HOME, null);
@@ -114,9 +122,10 @@ public class IoTDBDescriptor {
conf.setRpcPort(Integer.parseInt(properties.getProperty("rpc_port",
Integer.toString(conf.getRpcPort()))));
-
conf.setEnableWal(Boolean.parseBoolean(properties.getProperty("enable_wal",
- Boolean.toString(conf.isEnableWal()))));
-
+ if (iotdbType == null ||
!iotdbType.equals(IoTDBConstant.IOTDB_CLUSTER_TYPE)) {
+
conf.setEnableWal(Boolean.parseBoolean(properties.getProperty("enable_wal",
+ Boolean.toString(conf.isEnableWal()))));
+ }
conf.setFlushWalThreshold(Integer
.parseInt(properties.getProperty("flush_wal_threshold",
Integer.toString(conf.getFlushWalThreshold()))));
@@ -241,12 +250,6 @@ public class IoTDBDescriptor {
conf.setLanguageVersion(properties.getProperty("language_version",
conf.getLanguageVersion()).trim());
- conf.setEnableCluster(Boolean.parseBoolean(
- properties.getProperty("enable_cluster",
Boolean.toString(conf.isEnableCluster()))));
- if(conf.isEnableCluster()){
- conf.setJdbcServiceImplClassName(IoTDBConstant.CLUSTER_RPC_IMPL_CALSS);
- }
-
String tmpTimeZone = properties.getProperty("time_zone",
conf.getZoneID().toString());
try {
conf.setZoneID(ZoneId.of(tmpTimeZone.trim()));
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java
b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java
index 012f2b6..1ea2dd3 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/service/JDBCService.java
@@ -191,7 +191,7 @@ public class JDBCService implements JDBCServiceMBean,
IService {
throws IOException, ClassNotFoundException, IllegalAccessException,
InstantiationException {
protocolFactory = new TBinaryProtocol.Factory();
IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
- impl = (TSServiceImpl)
Class.forName(config.getJdbcServiceImplClassName()).newInstance();
+ impl = (TSServiceImpl)
Class.forName(config.getRpcImplClassName()).newInstance();
processor = new TSIService.Processor<>(impl);
this.threadStartLatch = threadStartLatch;
this.threadStopLatch = threadStopLatch;
