[incubator-iotdb] branch rel/0.10 updated: [To rel/0.10] add config description (#1320)

[qi...@apache.org]

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

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


The following commit(s) were added to refs/heads/rel/0.10 by this push:
     new 20766e6  [To rel/0.10] add config description (#1320)
20766e6 is described below

commit 20766e6f56163afddca70f126c437fc928e1b4ec
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Sat Jun 6 19:14:12 2020 +0800

    [To rel/0.10] add config description (#1320)
    
    * add config comment
---
 .../assembly/resources/conf/iotdb-engine.properties  | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 577bbff..7aec691 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -208,12 +208,15 @@ enable_partial_insert=true
 ### Memory Control Configuration
 ####################
 
-# Is dynamic parameter adapter enable. It's recommended for users to enable parameter adapter.
-# The adapter can dynamically adjust the following two parameters according to the memory load of the system:
-# 1. tsfile_size_threshold which is introduced below.
-# 2. memtable_size_threshold which is introduced below.
-# By dynamically adjusting these two parameters, the probability of system memory explosion is greatly reduced.
-# When this parameter is set true, it will refuse to create time series or add storage groups under high system load.
+# This adapter could adjust the system memory to avoid OOM.
+# It will refuse to create time series or add storage groups under high system load.
+#
+# Attention!!!
+# If disable this parameter, you need to set some parameters according to your system load:
+# Normal scenario: 1-50 storage groups. <100k devices, <10M time series
+# memtable_size_threshold = tsfile_size_threshold = IoTDB memory allocation / 2 / num of storage group / 4
+# Make sure the total num of time series in system * primitive_array_size <= IoTDB memory allocation / 2 / 4
+# you could reduce the primitive_array_size in very high workload.
 enable_parameter_adapter=true
 
 # Memory Allocation Ratio: Write, Read, and Free Memory.
@@ -221,8 +224,7 @@ enable_parameter_adapter=true
 write_read_free_memory_proportion=6:3:1
 
 # primitive array size (length of each array) in array pool
-primitive_array_size=64
-
+primitive_array_size=128
 
 ####################
 ### Upgrade Configurations
@@ -237,7 +239,7 @@ upgrade_thread_num=1
 ### Query Configurations
 ####################
 
-# the default time period that used in fill query, -1 by default means infinite past time
+# the default time period that used in fill query, -1 by default means infinite past time, in ms
 default_fill_interval=-1
 
 ####################