Merge branch 'develop' into feature/2.0tsdb

packaging/cfg/taos.cfg

@@ -15,28 +15,15 @@
 # arbitrator            arbitrator_hostname:6030     
 
 # the full-qualified domain name (FQDN) of dnode 
-# fqdn                  hostname:6030
+# fqdn                  hostname
 
-# port for MNode connect to Client, default udp[6030-6055] tcp[6030]
+# port for MNode connect to Client, default udp/tcp [6030-6040]
 # serverPort            6030
 
-# http service port, default tcp[6020]
+# http service port, default tcp [6020]
 # httpPort              6020
 
-# set socket type ("udp" and "tcp")
-# the server and client should have the same socket type. Otherwise, connect will fail
-# sockettype            udp
-
-# for the cluster version, data file's directory is configured this way 
-# option                mount_path           tier_level
-# dataDir               /mnt/disk1/taos      0
-# dataDir               /mnt/disk2/taos      0
-# dataDir               /mnt/disk3/taos      0
-# dataDir               /mnt/disk4/taos      0
-# dataDir               /mnt/disk5/taos      0
-# dataDir               /mnt/disk6/taos      1
-# dataDir               /mnt/disk7/taos      1
-# for the stand-alone version, data file's directory is configured this way 
+# data file's directory
 # dataDir               /var/lib/taos
 
 # log file's directory
@@ -46,12 +33,12 @@
 # numOfMnodes           3
 
 # optional roles for dnode. 0 - any, 1 - mnode, 2 - dnode
-# alternativeRole       0
+# role                  0
 
 # number of threads per CPU core
 # numOfThreadsPerCore   1.0
 
-# number of vgroups per db
+# max number of vgroups per db
 # maxVgroupsPerDb       0
 
 # max number of tables per vnode
@@ -60,9 +47,6 @@
 # the ratio of threads responsible for querying in the total thread
 # ratioOfQueryThreads   0.5
 
-# interval of check load balance when the management node is in normal operation
-# balanceInterval       300
-
 # interval of DNode report status to MNode, unit is Second, for cluster version only 
 # statusInterval        1
 
@@ -82,13 +66,13 @@
 # tableMetaKeepTimer    7200
 
 # Minimum sliding window time
-# minSlidingTime         10
+# minSlidingTime        10
 
 # Time window minimum
-# minIntervalTime        10
+# minIntervalTime       10
 
 # max length of an SQL
-# maxSQLLength          65380
+# maxSQLLength          65480
 
 # Support the maximum number of records allowed for super table time sorting
 # maxNumOfOrderedRes    100000
@@ -153,11 +137,8 @@
 # Stop writing data when the disk size of the log folder is less than this value
 # minimalDataDirGB      0.1
 
-# mnode take into account while balance, for cluster version only 
-# mnodeEqualVnodeNum    4
-
 # number of seconds allowed for a dnode to be offline, for cluster version only 
-# offlineThreshold      864000
+# offlineThreshold      8640000
 
 # start http service
 # http                  1
@@ -165,7 +146,7 @@
 # start system monitor module
 # monitor               1
 
-# start http service
+# start muqq service
 # mqtt                  0
 
 # mqtt uri  
@@ -201,19 +182,22 @@
 # 131: output warning and error，135: output info, warning and error to log.
 # 199: output debug, info, warning and error to both screen and file
 
-# debug flag for basic utils
-# debugFlag             131
+# debug flag for all log type, take effect when non-zero value
+# debugFlag             0
 
 # debug flag for meta management messages
 # mDebugFlag            135
 
 # debug flag for dnode messages
-# dDebugFlag            131
+# dDebugFlag            135
 
-# debug flag for TDengine SDB
+# debug flag for sync module
 # sDebugFlag            135
 
-# debug flag for TDengine SDB
+# debug flag for WAL
+# wDebugFlag            135
+
+# debug flag for SDB
 # sdbDebugFlag          135
 
 # debug flag for RPC 
@@ -246,6 +230,9 @@
 # debug flag for query
 # qDebugflag            131
 
+# debug flag for vnode
+# vDebugflag            131
+
 # debug flag for http server
 # tsdbDebugFlag         131