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 2019/09/03 12:40:11 UTC
[incubator-iotdb] 01/03: fix
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch fix_travis
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 660725d2208653e6a124437bcb6cd85b6c99c2e5
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Sep 3 15:39:04 2019 +0800
fix
---
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +++++-----
.../main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +++---
.../src/main/java/org/apache/iotdb/db/service/JDBCService.java | 3 +--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 0c92dee..adf3f12 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -52,7 +52,7 @@ public class IoTDBConfig {
/**
* Max concurrent client number
*/
- private int maxConcurrentClientNum = 65535;
+ private int rpcMaxConcurrentClientNum = 65535;
/**
* Memory allocated for the read process
@@ -513,12 +513,12 @@ public class IoTDBConfig {
this.enableStatMonitor = enableStatMonitor;
}
- public int getMaxConcurrentClientNum() {
- return maxConcurrentClientNum;
+ public int getRpcMaxConcurrentClientNum() {
+ return rpcMaxConcurrentClientNum;
}
- public void setMaxConcurrentClientNum(int maxConcurrentClientNum) {
- this.maxConcurrentClientNum = maxConcurrentClientNum;
+ public void setRpcMaxConcurrentClientNum(int rpcMaxConcurrentClientNum) {
+ this.rpcMaxConcurrentClientNum = rpcMaxConcurrentClientNum;
}
public int getStatMonitorDetectFreqSec() {
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 9a8397f..c232aea 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -254,12 +254,12 @@ public class IoTDBDescriptor {
Integer.toString(conf.getPerformanceStatMemoryInKB())).trim()));
int maxConcurrentClientNum = Integer.parseInt(properties.
- getProperty("max_concurrent_client_num",
- Integer.toString(conf.getMaxConcurrentClientNum()).trim()));
+ getProperty("rpc_max_concurrent_client_num",
+ Integer.toString(conf.getRpcMaxConcurrentClientNum()).trim()));
if (maxConcurrentClientNum <= 0) {
maxConcurrentClientNum = 65535;
}
- conf.setMaxConcurrentClientNum(maxConcurrentClientNum);
+ conf.setRpcMaxConcurrentClientNum(maxConcurrentClientNum);
} catch (IOException e) {
logger.warn("Cannot load config file because, use default configuration", e);
diff --git a/server/src/main/java/org/apache/iotdb/db/service/JDBCService.java b/server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
index 45981f8..c4abfea 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/JDBCService.java
@@ -29,7 +29,6 @@ import org.apache.iotdb.db.exception.StartupException;
import org.apache.iotdb.service.rpc.thrift.TSIService;
import org.apache.iotdb.service.rpc.thrift.TSIService.Processor;
import org.apache.thrift.protocol.TBinaryProtocol;
-import org.apache.thrift.protocol.TBinaryProtocol.Factory;
import org.apache.thrift.protocol.TCompactProtocol;
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.server.TServer;
@@ -211,7 +210,7 @@ public class JDBCService implements JDBCServiceMBean, IService {
serverTransport = new TServerSocket(new InetSocketAddress(config.getRpcAddress(),
config.getRpcPort()));
poolArgs = new TThreadPoolServer.Args(serverTransport).maxWorkerThreads(IoTDBDescriptor.
- getInstance().getConfig().getMaxConcurrentClientNum()).minWorkerThreads(1);
+ getInstance().getConfig().getRpcMaxConcurrentClientNum()).minWorkerThreads(1);
poolArgs.executorService = IoTDBThreadPoolFactory.createThriftRpcClientThreadPool(poolArgs,
ThreadName.JDBC_CLIENT.getName());
poolArgs.processor(processor);