diff --git a/documentation/webdocs/markdowndocs/administrator-ch.md b/documentation/webdocs/markdowndocs/administrator-ch.md
index 289f2dbf91..b48cf23995 100644
--- a/documentation/webdocs/markdowndocs/administrator-ch.md
+++ b/documentation/webdocs/markdowndocs/administrator-ch.md
@@ -16,9 +16,9 @@
TDengine的所有可执行文件默认存放在 _/usr/local/taos/bin_ 目录下。其中包括：
-- _taosd_：TDengine服务端可执行文件
-- _taos_： TDengine Shell可执行文件
-- _taosdump_：数据导出工具
+- _taosd_：TDengine服务端可执行文件。
+- _taos_： TDengine Shell可执行文件。
+- _taosdump_：数据导出工具。
- *rmtaos*： 卸载TDengine的脚本, 该脚本会删除全部的程序和数据文件。请务必谨慎执行，如非必须不建议使用。
您可以通过修改系统配置文件taos.cfg来配置不同的数据目录和日志目录
diff --git a/packaging/cfg/taos.cfg b/packaging/cfg/taos.cfg
index 2d4ebb4095..f2dbc04353 100644
--- a/packaging/cfg/taos.cfg
+++ b/packaging/cfg/taos.cfg
@@ -11,9 +11,6 @@
# second full-qualified domain name (FQDN) for TDengine system, for cluster edition only
# second cluster_hostname2:6030
-# the arbitrator's full-qualified domain name (FQDN) for TDengine system, for cluster edition only
-# arbitrator arbitrator_hostname:6030
-
# the full-qualified domain name (FQDN) of dnode
# fqdn hostname
@@ -23,45 +20,57 @@
# http service port, default tcp [6020]
# httpPort 6020
-# data file's directory
-# dataDir /var/lib/taos
-
# log file's directory
# logDir /var/log/taos
-# number of management nodes in the system
-# numOfMnodes 3
+# scriptDir file's directory
+# scriptDir /var/log/taos
-# optional roles for dnode. 0 - any, 1 - mnode, 2 - dnode
-# role 0
+# data file's directory
+# dataDir /var/lib/taos
+
+# the arbitrator's full-qualified domain name (FQDN) for TDengine system, for cluster edition only
+# arbitrator arbitrator_hostname:6030
# number of threads per CPU core
# numOfThreadsPerCore 1.0
-# max number of vgroups per db
-# maxVgroupsPerDb 0
-
-# max number of tables per vnode
-# maxTablesPerVnode 1000000
-
# the ratio of threads responsible for querying in the total thread
# ratioOfQueryThreads 0.5
-# interval of DNode report status to MNode, unit is Second, for cluster version only
-# statusInterval 1
+# number of management nodes in the system
+# numOfMnodes 3
-# interval of Shell send HB to MNode, unit is Second
-# shellActivityTimer 3
+# if backup vnode directory when remove dnode
+# vnodeBak 1
+
+# Whether to start load balancing
+# balance 1
+
+# optional roles for dnode. 0 - any, 1 - mnode, 2 - dnode
+# role 0
+
+# max timer control block
+# maxTmrCtrl 512
# interval of system monitor
# monitorInterval 30
+# number of seconds allowed for a dnode to be offline, for cluster version only
+# offlineThreshold 8640000
+
# RPC re-try timer, millisecond
# rpcTimer 300
# RPC maximum time for ack, seconds
# rpcMaxTime 600
+# interval of DNode report status to MNode, unit is Second, for cluster version only
+# statusInterval 1
+
+# interval of Shell send HB to MNode, unit is Second
+# shellActivityTimer 3
+
# duration of to keep tableMeta kept in Cache, seconds
# tableMetaKeepTimer 7200
@@ -71,38 +80,38 @@
# Time window minimum
# minIntervalTime 10
-# max length of an SQL
-# maxSQLLength 65480
+# the max allowed delayed time for launching continuous query. 20ms by default
+# maxStreamCompDelay 20000
-# Support the maximum number of records allowed for super table time sorting
-# maxNumOfOrderedRes 100000
+# The minimum time to wait before the first stream execution
+# maxFirstStreamCompDelay 10000
-# system locale
-# locale en_US.UTF-8
+# Retry wait time benchmark
+# retryStreamCompDelay 10
-# default system charset
-# charset UTF-8
+# the delayed time for launching each continuous query. 10% of the whole computing time window by default.
+# streamCompDelayRatio 0.1
-# system time zone
-# timezone Asia/Shanghai (CST, +0800)
+# max number of vgroups per db
+# maxVgroupsPerDb 0
-# set write ahead log (WAL) level
-# walLevel 1
+# max number of tables per vnode
+# maxTablesPerVnode 1000000
-# enable/disable async log
-# asyncLog 1
-
-# the compressed rpc message, option:
-# -1 (no compression)
-# 0 (all message compressed),
-# > 0 (rpc message body which larger than this value will be compressed)
-# compressMsgSize -1
+# Step size of increasing table number in vnode
+# tableIncStepPerVnode 1000
# cache block size (Mbyte)
-# cache 16
+# cache 16
# number of cache blocks per vnode
-# blocks 4
+# blocks 6
+
+# number of days per DB file
+# days 10
+
+# number of days to keep DB file
+# keep 3650
# min row of records in file block
# minRows 100
@@ -111,17 +120,44 @@
# maxRows 4096
# enable/disable compression
-# comp 1
+# comp 2
-# number of days per DB file
-# days 10
+# set write ahead log (WAL) level
+# walLevel 1
-# number of days to keep DB file
-# keep 3650
+# When walLevel is set to 2, the cycle of fsync is executed
+# fsync 3000
# number of replications, for cluster version only
# replica 1
+# mqtt uri
+# mqttBrokerAddress mqtt://username:password@hostname:1883/taos/
+
+# mqtt client name
+# mqttBrokerClientId taos_mqtt
+
+# the compressed rpc message, option:
+# -1 (no compression)
+# 0 (all message compressed),
+# > 0 (rpc message body which larger than this value will be compressed)
+# compressMsgSize -1
+
+# max length of an SQL
+# maxSQLLength 65480
+
+# Support the maximum number of records allowed for super table time sorting
+# maxNumOfOrderedRes 100000
+
+# system time zone
+# timezone Asia/Shanghai (CST, +0800)
+
+# system locale
+# locale en_US.UTF-8
+
+# default system charset
+# charset UTF-8
+
# max number of connections from client for dnode
# maxShellConns 5000
@@ -137,50 +173,36 @@
# Stop writing data when the disk size of the log folder is less than this value
# minimalDataDirGB 0.1
-# number of seconds allowed for a dnode to be offline, for cluster version only
-# offlineThreshold 8640000
-
# start http service
# http 1
-# start system monitor module
-# monitor 1
-
# start muqq service
# mqtt 0
-# mqtt uri
-# mqttBrokerAddress mqtt://username:password@hostname:1883/taos/
+# start system monitor module
+# monitor 1
-# mqtt client name
-# mqttBrokerClientId taos_mqtt
-
-# maximum number of rows returned by the restful interface
-# restfulRowLimit 10240
+# Record the SQL through restful interface
+# httpEnableRecordSql 0
# number of threads used to process http requests
# httpMaxThreads 2
-# The minimum time to wait before the first stream execution
-# maxFirstStreamCompDelay 10000
-
-# Retry wait time benchmark
-# retryStreamCompDelay 10
-
-# the delayed time for launching each continuous query. 10% of the whole computing time window by default.
-# streamCompDelayRatio 0.1
-
-# the max allowed delayed time for launching continuous query. 20ms by default
-# maxStreamCompDelay 20000
+# maximum number of rows returned by the restful interface
+# restfulRowLimit 10240
# The following parameter is used to limit the maximum number of lines in log files.
# max number of rows per log filters
# numOfLogLines 10000000
+# enable/disable async log
+# asyncLog 1
+
# The following parameters are used for debug purpose only.
# debugFlag 8 bits mask: FILE-SCREEN-UNUSED-HeartBeat-DUMP-TRACE_WARN-ERROR
-# 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
+# 131: output warning and error, 135: output debug, warning and error, 143 : output trace, debug, warning and error to log.
+# 199: output debug, warning and error to both screen and file
+# 207: output trace, debug, warning and error to both screen and file
# debug flag for all log type, take effect when non-zero value
# debugFlag 0
@@ -236,9 +258,6 @@
# debug flag for http server
# tsdbDebugFlag 131
-# Record the SQL through restful interface
-# httpEnableRecordSql 0
-
# Record the SQL in taos client
# tscEnableRecordSql 0
diff --git a/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml b/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
index 4e307db079..52067343ef 100644
--- a/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
+++ b/tests/comparisonTest/opentsdb/opentsdbtest/pom.xml
@@ -94,7 +94,7 @@
com.google.guava
guava
- 24.1.1
+ 29.0-jre