[iotdb] branch rel/0.11 updated: change some mem control default parameters (#2053)

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.11 by this push:
     new faafff4  change some mem control default parameters (#2053)
faafff4 is described below

commit faafff46c66e844d35e4a27e4377d5b54f24f0e8
Author: Haonan <hh...@outlook.com>
AuthorDate: Tue Nov 17 18:45:04 2020 +0800

    change some mem control default parameters (#2053)
---
 server/src/assembly/resources/conf/iotdb-engine.properties   | 12 ++++++------
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index b0a691b..3814ee7 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -229,8 +229,8 @@ write_read_schema_free_memory_proportion=4:3:1:2
 # primitive array size (length of each array) in array pool
 primitive_array_size=128
 
-# Ratio of write memory for invoking flush disk, 0.3 by default
-flush_proportion=0.3
+# Ratio of write memory for invoking flush disk, 0.4 by default
+flush_proportion=0.4
 
 # Ratio of write memory allocated for buffered arrays, 0.6 by default
 buffered_arrays_memory_proportion=0.6
@@ -245,11 +245,11 @@ storage_group_report_threshold=16777216
 # it's just an advised value, the real limitation will be the smaller one between this and the one we calculated
 max_deduplicated_path_num=1000
 
-# When an inserting is rejected, waiting time (in ms) to check system again.
-waiting_time_when_insert_blocked=10
+# When an inserting is rejected, waiting time (in ms) to check system again, 0 by default.
+waiting_time_when_insert_blocked=0
 
-# When the waiting time of an inserting exceeds this, throw an exception.
-max_waiting_time_when_insert_blocked=10000
+# When the waiting time (in ms) of an inserting exceeds this, throw an exception. 0 by default.
+max_waiting_time_when_insert_blocked=0
 
 # estimated metadata size (in byte) of one timeseries in Mtree
 estimated_series_size=300
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 72718e2..0ae55b6 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
@@ -149,7 +149,7 @@ public class IoTDBConfig {
   /**
    * Flush proportion for system
    */
-  private double flushProportion = 0.3;
+  private double flushProportion = 0.4;
 
   /**
    * Reject proportion for system
@@ -164,12 +164,12 @@ public class IoTDBConfig {
   /**
    * When inserting rejected, waiting this time to check system again
    */
-  private int waitingTimeWhenInsertBlockedInMs = 10;
+  private int waitingTimeWhenInsertBlockedInMs = 0;
 
   /**
    * When inserting rejected exceeds this, throw an exception
    */
-  private int maxWaitingTimeWhenInsertBlockedInMs = 10000; 
+  private int maxWaitingTimeWhenInsertBlockedInMs = 0; 
   /**
    * Is the write ahead log enable.
    */