This is an automated email from the ASF dual-hosted git repository.
neuyilan 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 13f846a fix some config inconsistent (#3082)
13f846a is described below
commit 13f846ac11bed8c24a6af98c30093eee5e9adc2e
Author: chaow <[email protected]>
AuthorDate: Thu Apr 29 11:13:39 2021 +0800
fix some config inconsistent (#3082)
---
cli/pom.xml | 2 +-
cluster/pom.xml | 12 ++++++------
cluster/src/assembly/resources/conf/iotdb-cluster.properties | 6 +++---
.../java/org/apache/iotdb/cluster/config/ClusterConfig.java | 8 ++++----
compile-tools/pom.xml | 2 +-
example/hadoop/pom.xml | 3 +--
example/udf/pom.xml | 2 +-
hadoop/pom.xml | 2 +-
hive-connector/pom.xml | 5 ++---
server/src/assembly/resources/conf/iotdb-engine.properties | 4 ++--
.../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 ++--
service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java | 4 ++--
spark-tsfile/pom.xml | 2 +-
13 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/cli/pom.xml b/cli/pom.xml
index 166231b..acb3304 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-server</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/cluster/pom.xml b/cluster/pom.xml
index 303a26f..96a4541 100644
--- a/cluster/pom.xml
+++ b/cluster/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>service-rpc</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.thrift</groupId>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-server</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.thrift</groupId>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-thrift-cluster</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.thrift</groupId>
@@ -96,20 +96,20 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-server</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-session</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-jdbc</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/cluster/src/assembly/resources/conf/iotdb-cluster.properties
b/cluster/src/assembly/resources/conf/iotdb-cluster.properties
index 1ce4a43..dd0a257 100644
--- a/cluster/src/assembly/resources/conf/iotdb-cluster.properties
+++ b/cluster/src/assembly/resources/conf/iotdb-cluster.properties
@@ -88,7 +88,7 @@ default_replica_num=1
# so the leader will send logs(snapshot) to the follower,
# NOTICE, it may cost minutes of time to send a snapshot,
# so this parameter should be larger than the snapshot cost time.
-# catch_up_timeout_ms=60000
+# catch_up_timeout_ms=300000
# whether to use batch append entries in log catch up
# use_batch_in_catch_up=true
@@ -96,12 +96,12 @@ default_replica_num=1
# the minimum number of committed logs in memory, after each log deletion, at
most such number of logs
# will remain in memory. Increasing the number will reduce the chance to use
snapshot in catch-ups,
# but will also increase the memory footprint
-# min_num_of_logs_in_mem=100
+# min_num_of_logs_in_mem=1000
# maximum number of committed logs in memory, when reached, a log deletion
will be triggered.
# Increasing the number will reduce the chance to use snapshot in catch-ups,
but will also increase
# memory footprint
-# max_num_of_logs_in_mem=1000
+# max_num_of_logs_in_mem=2000
# maximum memory size of committed logs in memory, when reached, a log
deletion will be triggered.
# Increasing the number will reduce the chance to use snapshot in catch-ups,
but will also increase
diff --git
a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
index 7d3e42a..a2bb2de 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java
@@ -59,15 +59,15 @@ public class ClusterConfig {
private int writeOperationTimeoutMS = (int) TimeUnit.SECONDS.toMillis(30);
- private int catchUpTimeoutMS = (int) TimeUnit.SECONDS.toMillis(60);
+ private int catchUpTimeoutMS = (int) TimeUnit.SECONDS.toMillis(300);
private boolean useBatchInLogCatchUp = true;
/** max number of committed logs to be saved */
- private int minNumOfLogsInMem = 100;
+ private int minNumOfLogsInMem = 1000;
/** max number of committed logs in memory */
- private int maxNumOfLogsInMem = 1000;
+ private int maxNumOfLogsInMem = 2000;
/** max memory size of committed logs in memory, default 512M */
private long maxMemorySizeForRaftLog = 536870912;
@@ -146,7 +146,7 @@ public class ClusterConfig {
/** The maximum number of logs saved on the disk */
private int maxPersistRaftLogNumberOnDisk = 1_000_000;
- private boolean enableUsePersistLogOnDiskToCatchUp = false;
+ private boolean enableUsePersistLogOnDiskToCatchUp = true;
/**
* The number of logs read on the disk at one time, which is mainly used to
control the memory
diff --git a/compile-tools/pom.xml b/compile-tools/pom.xml
index a5c7ad1..df5448f 100644
--- a/compile-tools/pom.xml
+++ b/compile-tools/pom.xml
@@ -20,8 +20,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-parent</artifactId>
<version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/example/hadoop/pom.xml b/example/hadoop/pom.xml
index e4a06db..7b642e6 100644
--- a/example/hadoop/pom.xml
+++ b/example/hadoop/pom.xml
@@ -28,13 +28,12 @@
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hadoop-example</artifactId>
- <version>0.13.0-SNAPSHOT</version>
<name>hadoop-example</name>
<dependencies>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/example/udf/pom.xml b/example/udf/pom.xml
index 5bb6712..4439eea 100644
--- a/example/udf/pom.xml
+++ b/example/udf/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-server</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/hadoop/pom.xml b/hadoop/pom.xml
index c2f7fd5..8aae383 100644
--- a/hadoop/pom.xml
+++ b/hadoop/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>tsfile</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml
index a7053ae..d58ea47 100644
--- a/hive-connector/pom.xml
+++ b/hive-connector/pom.xml
@@ -22,13 +22,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>iotdb-parent</artifactId>
<groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-parent</artifactId>
<version>0.13.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hive-connector</artifactId>
- <version>0.13.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -38,7 +37,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-engine.properties
index 6ded82c..e7cd8ce 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -50,9 +50,9 @@ rpc_port=6667
# Datatype: int
# rpc_max_concurrent_client_num=65535
-# thrift max frame size, 64MB by default
+# thrift max frame size, 512MB by default
# Datatype: int
-# thrift_max_frame_size=67108864
+# thrift_max_frame_size=536870912
# thrift init buffer size
# Datatype: int
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 ee83180..0c9583a 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
@@ -118,7 +118,7 @@ public class IoTDBConfig {
private long allocateMemoryForSchema = Runtime.getRuntime().maxMemory() * 1
/ 10;
/** Memory allocated for the read process besides cache */
- private long allocateMemoryForReadWithoutCache =
Runtime.getRuntime().maxMemory() * 9 / 100;
+ private long allocateMemoryForReadWithoutCache = allocateMemoryForRead * 3 /
10;
private volatile int maxQueryDeduplicatedPathNum = 1000;
@@ -559,7 +559,7 @@ public class IoTDBConfig {
private String kerberosKeytabFilePath = "/path";
/** kerberos principal */
- private String kerberosPrincipal = "principal";
+ private String kerberosPrincipal = "your principal";
/** the num of memtable in each storage group */
private int concurrentWritingTimePartition = 1;
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
index df5ef19..5835c5e 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java
@@ -37,8 +37,8 @@ import java.util.Map;
public class RpcUtils {
- /** How big should the default read and write buffers be? Defaults to 64KB */
- public static final int THRIFT_DEFAULT_BUF_CAPACITY = 64 * 1024;
+ /** How big should the default read and write buffers be? Defaults to 1KB */
+ public static final int THRIFT_DEFAULT_BUF_CAPACITY = 1024;
/**
* It is used to prevent the size of the parsing package from being too
large and allocating the
* buffer will cause oom. Therefore, the maximum length of the requested
memory is limited when
diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml
index bad7249..644d2df 100644
--- a/spark-tsfile/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>hadoop-tsfile</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
