Merge pull request #2960 from taosdata/patch/default-conf

update default configuration

packaging/cfg/taos.cfg

@@ -5,20 +5,20 @@
 #                                                      #
 ########################################################
 
-# first full-qualified domain name (FQDN) for TDengine system
+# first fully qualified domain name (FQDN) for TDengine system
 # firstEp               hostname1:6030
 
-# second full-qualified domain name (FQDN) for TDengine system, for cluster edition only
+# second fully qualified domain name (FQDN) for TDengine system, for cluster only
 # secondEp              cluster_hostname2:6030
 
-# the full-qualified domain name (FQDN) of dnode 
+# local fully qualified domain name (FQDN)
 # fqdn                  hostname
 
-# port for MNode connect to Client, default udp/tcp [6030-6040]
+# first port number for the connection (10 continuous UDP/TCP port number are used) 
 # serverPort            6030
 
-# http service port, default tcp [6020]
-# httpPort              6020
+# http service port, default tcp [6041] 
+# httpPort              6041
 
 # log file's directory
 # logDir                /var/log/taos
@@ -26,76 +26,73 @@
 # data file's directory
 # dataDir               /var/lib/taos
 
-# the arbitrator's full-qualified domain name (FQDN) for TDengine system, for cluster edition only   
+# the arbitrator's fully qualified domain name (FQDN) for TDengine system, for cluster only   
 # arbitrator            arbitrator_hostname:6030     
 
 # number of threads per CPU core
 # numOfThreadsPerCore   1.0
 
-# the ratio of threads responsible for querying in the total thread
-# ratioOfQueryThreads   0.5
-
 # number of management nodes in the system
 # numOfMnodes           3
 
-# if backup vnode directory when remove dnode
+# enable/disable backuping vnode directory when removing dnode
 # vnodeBak              1
 
-# Whether to start load balancing
+# enable/disable load balancing
 # balance               1
 
-# optional roles for dnode. 0 - any, 1 - mnode, 2 - dnode
+# role for dnode. 0 - any, 1 - mnode, 2 - dnode
 # role                  0
 
-# max timer control block
+# max timer control blocks
 # maxTmrCtrl            512
 
-# interval of system monitor 
+# time interval of system monitor, seconds 
 # monitorInterval       30
 
-# number of seconds allowed for a dnode to be offline, for cluster version only 
+# number of seconds allowed for a dnode to be offline, for cluster only 
 # offlineThreshold      8640000
 
 # RPC re-try timer, millisecond
 # rpcTimer              300
 
-# RPC maximum time for ack, seconds
+# RPC maximum time for ack, seconds. 
 # rpcMaxTime            600
 
-# interval of DNode report status to MNode, unit is Second, for cluster version only 
+# time interval of dnode status reporting to mnode, seconds, for cluster only 
 # statusInterval        1
 
-# interval of Shell send HB to MNode, unit is Second
+# time interval of heart beat from shell to dnode, seconds
 # shellActivityTimer    3
 
-# duration of to keep tableMeta kept in Cache, seconds
+# time of keeping table meta data in cache, seconds
 # tableMetaKeepTimer    7200
 
-# Minimum sliding window time
+# minimum sliding window time, milli-second
 # minSlidingTime        10
 
-# Time window minimum
+# minimum time window, milli-second
 # minIntervalTime       10
 
-# the max allowed delayed time for launching continuous query. 20ms by default
+# maximum delay before launching a stream compution, milli-second
 # maxStreamCompDelay    20000
 
-# The minimum time to wait before the first stream execution
+# maximum delay before launching a stream computation for the first time, milli-second
 # maxFirstStreamCompDelay   10000
 
-# Retry wait time benchmark
+# retry delay when a stream computation fails, milli-second
 # retryStreamCompDelay      10
 
-# the delayed time for launching each continuous query. 10% of the whole computing time window by default.
+# the delayed time for launching a stream computation, from 0.1(default, 10% of whole computing time window) to 0.9
 # streamCompDelayRatio      0.1
 
-# max number of vgroups per db
+# max number of vgroups per db, 0 means configured automatically
 # maxVgroupsPerDb           0
 
 # max number of tables per vnode
 # maxTablesPerVnode         1000000
 
-# Step size of increasing table number in vnode
+# step size of increasing table number in a vnode
 # tableIncStepPerVnode      1000
 
 # cache block size (Mbyte)
@@ -110,22 +107,22 @@
 # number of days to keep DB file
 # keep                  3650
 
-# min row of records in file block
+# minimum rows of records in file block
 # minRows               100
 
-# max row of records in file block
+# maximum rows of records in file block
 # maxRows               4096
 
 # enable/disable compression
 # comp                  2
 
-# set write ahead log (WAL) level
+# write ahead log (WAL) level, 0: no wal; 1: write wal, but no fysnc; 2: write wal, and call fsync
 # walLevel              1
 
-# When walLevel is set to 2, the cycle of fsync is executed
+# if walLevel is set to 2, the cycle of fsync being executed, if set to 0, fsync is called right away
 # fsync                 3000
 
-# number of replications, for cluster version only 
+# number of replications, for cluster only 
 # replica               1
 
 # mqtt uri  
@@ -143,7 +140,7 @@
 # max length of an SQL
 # maxSQLLength          65480
 
-# Support the maximum number of records allowed for super table time sorting
+# the maximum number of records allowed for super table time sorting
 # maxNumOfOrderedRes    100000
 
 # system time zone
@@ -155,31 +152,31 @@
 # default system charset
 # charset               UTF-8
 
-# max number of connections from client for dnode
+# max number of connections allowed in dnode
 # maxShellConns         5000
 
-# max numerber of connections to one database
+# max numerber of connections allowed in client 
 # maxConnections        5000
 
-# Stop writing logs when the disk size of the log folder is less than this value
+# stop writing logs when the disk size of the log folder is less than this value
 # minimalLogDirGB       0.1
 
-# Stop writing temporary files when the disk size of the log folder is less than this value
+# stop writing temporary files when the disk size of the log folder is less than this value
 # minimalTmpDirGB       0.1
 
-# Stop writing data when the disk size of the log folder is less than this value
+# stop writing data when the disk size of the log folder is less than this value
 # minimalDataDirGB      0.1
 
-# start http service
+# enbale/disable http service
 # http                  1
 
-# start muqq service
+# enable/disable muqq service
 # mqtt                  0
 
-# start system monitor module
+# enable/disable system monitor 
 # monitor               1
 
-# Record the SQL through restful interface
+# enable/disable recording the SQL statements via restful interface
 # httpEnableRecordSql   0
 
 # number of threads used to process http requests
@@ -255,11 +252,12 @@
 # debug flag for http server
 # tsdbDebugFlag         131
 
-# Record the SQL in taos client
+# enable/disable recording the SQL in taos client
 # tscEnableRecordSql    0
 
-# if generate core file when service crash
+# generate core file when service crash
 # enableCoreFile        1
 
-# The maximum display width of binary and nchar fields in the shell. The parts exceeding this limit will be hidden
+# maximum display width of binary and nchar fields in the shell. The parts exceeding this limit will be hidden
 # maxBinaryDisplayWidth 30
+