diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index 7458e5d837..8bce28d34c 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -21,26 +21,9 @@ extern "C" {
 #endif
 
 #include "tdef.h"
-#include "tcfg.h"
-
-// cluster
-extern int32_t  tsStatusInterval;
-extern int8_t   tsEnableTelemetryReporting;
-extern int32_t  tsNumOfSupportVnodes;
 
 // common
-extern int      tsRpcTimer;
-extern int      tsRpcMaxTime;
-extern int      tsRpcForceTcp;  // all commands go to tcp protocol if this is enabled
-extern int32_t  tsMaxConnections;
-extern int32_t  tsMaxShellConns;
-extern int32_t  tsShellActivityTimer;
-extern uint32_t tsMaxTmrCtrl;
-extern float    tsNumOfThreadsPerCore;
-extern int32_t  tsNumOfCommitThreads;
-extern float    tsRatioOfQueryCores;
 extern int8_t   tsDaylight;
-extern int8_t   tsEnableCoreFile;
 extern int32_t  tsCompressMsgSize;
 extern int32_t  tsCompressColData;
 extern int32_t  tsMaxNumOfDistinctResults;
@@ -73,24 +56,9 @@ extern int32_t tsProjectExecInterval;
 extern int64_t tsMaxRetentWindow;
 
 // system info
-extern float    tsTotalLogDirGB;
-extern float    tsTotalTmpDirGB;
-extern float    tsTotalDataDirGB;
-extern float    tsAvailLogDirGB;
-extern float    tsAvailTmpDirectorySpace;
-extern float    tsAvailDataDirGB;
-extern float    tsUsedDataDirGB;
-extern float    tsMinimalLogDirGB;
-extern float    tsReservedTmpDirectorySpace;
-extern float    tsMinimalDataDirGB;
+
 extern uint32_t tsVersion;
 
-// build info
-extern char version[];
-extern char compatible_version[];
-extern char gitinfo[];
-extern char gitinfoOfInternal[];
-extern char buildinfo[];
 
 // lossy
 extern char     tsLossyColumns[];
diff --git a/include/os/osEnv.h b/include/os/osEnv.h
index fec3b1abc4..2745520ae3 100644
--- a/include/os/osEnv.h
+++ b/include/os/osEnv.h
@@ -21,9 +21,24 @@ extern "C" {
 #endif
 
 extern char tsOsName[];
+
 extern char tsDataDir[];
+extern char tsLogDir[];
+extern char tsTempDir[];
 extern char configDir[];
 
+extern struct SDiskSpace tsLogSpace;
+extern struct SDiskSpace tsTempSpace;
+extern struct SDiskSpace tsDataSpace;
+
+void taosUpdateLogSpace();
+void taosUpdateTempSpace();
+void taosUpdateDataSpace();
+bool taosLogSpaceAvailable();
+bool taosTmpSpaceAvailable();
+bool taosDataSpaceAvailable();
+void taosUpdateAllSpace();
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/os/osSysinfo.h b/include/os/osSysinfo.h
index 9dcb075489..6ab2a104df 100644
--- a/include/os/osSysinfo.h
+++ b/include/os/osSysinfo.h
@@ -25,21 +25,28 @@ extern "C" {
 #define TSDB_LOCALE_LEN   64
 #define TSDB_TIMEZONE_LEN 96
 
-extern int64_t tsPageSize;
-extern int64_t tsOpenMax;
-extern int64_t tsStreamMax;
-extern int32_t tsNumOfCores;
-extern int32_t tsTotalMemoryMB;
-extern char     tsTimezone[];
-extern char     tsLocale[];
-extern char     tsCharset[];            // default encode string
-
 typedef struct {
   int64_t total;
   int64_t used;
   int64_t avail;
 } SDiskSize;
 
+typedef struct SDiskSpace {
+  int64_t   reserved;
+  SDiskSize size;
+} SDiskSpace;
+
+extern int64_t tsPageSize;
+extern int64_t tsOpenMax;
+extern int64_t tsStreamMax;
+extern int32_t tsNumOfCores;
+extern int32_t tsTotalMemoryMB;
+extern char    tsTimezone[];
+extern char    tsLocale[];
+extern char    tsCharset[];  // default encode string
+
+
+
 int32_t taosGetDiskSize(char *dataDir, SDiskSize *diskSize);
 int32_t taosGetCpuCores();
 void    taosGetSystemInfo();
diff --git a/include/util/tlog.h b/include/util/tlog.h
index cdcac84ab7..166e186508 100644
--- a/include/util/tlog.h
+++ b/include/util/tlog.h
@@ -22,7 +22,6 @@
 extern "C" {
 #endif
 
-extern char    tsLogDir[];
 extern bool    tsLogInited;
 extern bool    tsAsyncLog;
 extern int32_t tsNumOfLogLines;
diff --git a/include/util/ttimer.h b/include/util/ttimer.h
index 89ec6cd8d9..01d70c7d02 100644
--- a/include/util/ttimer.h
+++ b/include/util/ttimer.h
@@ -26,7 +26,6 @@ typedef void *tmr_h;
 typedef void (*TAOS_TMR_CALLBACK)(void *, void *);
 
 extern int      taosTmrThreads;
-extern uint32_t tsMaxTmrCtrl;
 
 #define MSECONDS_PER_TICK 5
 
diff --git a/include/util/version.h b/include/util/version.h
new file mode 100644
index 0000000000..01efecc59d
--- /dev/null
+++ b/include/util/version.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _TD_UTIL_VERSION_H
+#define _TD_UTIL_VERSION_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern char version[];
+extern char compatible_version[];
+extern char gitinfo[];
+extern char gitinfoOfInternal[];
+extern char buildinfo[];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*_TD_UTIL_VERSION_H*/
diff --git a/source/client/src/clientCfg.c b/source/client/src/clientCfg.c
index ca671ab150..22b1407a15 100644
--- a/source/client/src/clientCfg.c
+++ b/source/client/src/clientCfg.c
@@ -159,8 +159,9 @@ static int32_t tscAddCfg(SConfig *pCfg) {
   if (cfgAddInt32(pCfg, "statusInterval", 1, 1, 30) != 0) return -1;
   if (cfgAddFloat(pCfg, "numOfThreadsPerCore", 1, 0, 10) != 0) return -1;
   if (cfgAddFloat(pCfg, "ratioOfQueryCores", 1, 0, 5) != 0) return -1;
-  if (cfgAddInt32(pCfg, "maxShellConns", 50000, 10, 50000000) != 0) return -1;
   if (cfgAddInt32(pCfg, "shellActivityTimer", 3, 1, 120) != 0) return -1;
+
+  if (cfgAddInt32(pCfg, "maxConnections", 50000, 1, 100000) != 0) return -1;
   return 0;
 }
 
diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c
index c7640e90d8..38f94ecae8 100644
--- a/source/client/src/clientEnv.c
+++ b/source/client/src/clientEnv.c
@@ -90,10 +90,10 @@ void* openTransporter(const char *user, const char *auth, int32_t numOfThread) {
   rpcInit.label = "TSC";
   rpcInit.numOfThreads = numOfThread;
   rpcInit.cfp = processMsgFromServer;
-  rpcInit.sessions = tsMaxConnections;
+  rpcInit.sessions = cfgGetItem(tscCfg, "maxConnections")->i32;
   rpcInit.connType = TAOS_CONN_CLIENT;
   rpcInit.user = (char *)user;
-  rpcInit.idleTime = tsShellActivityTimer * 1000;
+  rpcInit.idleTime = cfgGetItem(tscCfg, "shellActivityTimer")->i32 * 1000;
   rpcInit.ckey = "key";
   rpcInit.spi = 1;
   rpcInit.secret = (char *)auth;
diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c
index 00d629ebb2..5bcc287116 100644
--- a/source/client/src/clientMain.c
+++ b/source/client/src/clientMain.c
@@ -7,6 +7,7 @@
 #include "tmsg.h"
 #include "tglobal.h"
 #include "catalog.h"
+#include "version.h"
 
 #define TSC_VAR_NOT_RELEASE 1
 #define TSC_VAR_RELEASED    0
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 9bd9386244..72783bf4ab 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -27,24 +27,9 @@
 #include "tutil.h"
 #include "ulog.h"
 
-// cluster
-int32_t  tsStatusInterval = 1;  // second
-int8_t   tsEnableTelemetryReporting = 0;
-char     tsEmail[TSDB_FQDN_LEN] = {0};
-int32_t  tsNumOfSupportVnodes = 128;
 
 // common
-int32_t tsRpcTimer = 300;
-int32_t tsRpcMaxTime = 600;  // seconds;
-int32_t tsRpcForceTcp = 1;   // disable this, means query, show command use udp protocol as default
-int32_t tsMaxShellConns = 50000;
-int32_t tsMaxConnections = 50000;
-int32_t tsShellActivityTimer = 3;  // second
-float   tsNumOfThreadsPerCore = 1.0f;
-int32_t tsNumOfCommitThreads = 4;
-float   tsRatioOfQueryCores = 1.0f;
 int8_t  tsDaylight = 0;
-int8_t  tsEnableCoreFile = 0;
 int32_t tsMaxBinaryDisplayWidth = 30;
 int8_t  tsEnableSlaveQuery = 1;
 int8_t  tsEnableAdjustMaster = 1;
@@ -125,12 +110,6 @@ int8_t tsDeadLockKillQuery = 0;
 // For backward compatibility
 bool tsdbForceKeepFile = false;
 
-#ifndef _STORAGE
-SDiskCfg tsDiskCfg[1];
-#else
-SDiskCfg tsDiskCfg[TFS_MAX_DISKS];
-#endif
-
 /*
  * minimum scale for whole system, millisecond by default
  * for TSDB_TIME_PRECISION_MILLI: 86400000L
@@ -140,13 +119,6 @@ SDiskCfg tsDiskCfg[TFS_MAX_DISKS];
 int64_t tsTickPerDay[] = {86400000L, 86400000000L, 86400000000000L};
 
 // system info
-float    tsTotalTmpDirGB = 0;
-float    tsTotalDataDirGB = 0;
-float    tsAvailTmpDirectorySpace = 0;
-float    tsAvailDataDirGB = 0;
-float    tsUsedDataDirGB = 0;
-float    tsReservedTmpDirectorySpace = 1.0f;
-float    tsMinimalDataDirGB = 2.0f;
 int32_t  tsTotalMemoryMB = 0;
 uint32_t tsVersion = 0;
 
@@ -247,12 +219,12 @@ int32_t taosCfgDynamicOptions(char *msg) {
   return false;
 }
 
-void taosAddDataDir(int index, char *v1, int level, int primary) {
-  tstrncpy(tsDiskCfg[index].dir, v1, TSDB_FILENAME_LEN);
-  tsDiskCfg[index].level = level;
-  tsDiskCfg[index].primary = primary;
-  uTrace("dataDir:%s, level:%d primary:%d is configured", v1, level, primary);
-}
+// void taosAddDataDir(int index, char *v1, int level, int primary) {
+//   tstrncpy(tsDiskCfg[index].dir, v1, TSDB_FILENAME_LEN);
+//   tsDiskCfg[index].level = level;
+//   tsDiskCfg[index].primary = primary;
+//   uTrace("dataDir:%s, level:%d primary:%d is configured", v1, level, primary);
+// }
 
 #ifndef _STORAGE
 // void taosReadDataDirCfg(char *v1, char *v2, char *v3) {
@@ -302,58 +274,6 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosAddConfigOption(cfg);
 
-  cfg.option = "telemetryReporting";
-  cfg.ptr = &tsEnableTelemetryReporting;
-  cfg.valType = TAOS_CFG_VTYPE_INT8;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 0;
-  cfg.maxValue = 1;
-  cfg.ptrLength = 1;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosAddConfigOption(cfg);
-
-  // timer
-  cfg.option = "maxTmrCtrl";
-  cfg.ptr = &tsMaxTmrCtrl;
-  cfg.valType = TAOS_CFG_VTYPE_INT32;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 8;
-  cfg.maxValue = 2048;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosAddConfigOption(cfg);
-
-  cfg.option = "rpcTimer";
-  cfg.ptr = &tsRpcTimer;
-  cfg.valType = TAOS_CFG_VTYPE_INT32;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
-  cfg.minValue = 100;
-  cfg.maxValue = 3000;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_MS;
-  taosAddConfigOption(cfg);
-
-  cfg.option = "rpcForceTcp";
-  cfg.ptr = &tsRpcForceTcp;
-  cfg.valType = TAOS_CFG_VTYPE_INT32;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
-  cfg.minValue = 0;
-  cfg.maxValue = 1;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosAddConfigOption(cfg);
-
-  cfg.option = "rpcMaxTime";
-  cfg.ptr = &tsRpcMaxTime;
-  cfg.valType = TAOS_CFG_VTYPE_INT32;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
-  cfg.minValue = 100;
-  cfg.maxValue = 7200;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_SECOND;
-  taosAddConfigOption(cfg);
-
-
   cfg.option = "minSlidingTime";
   cfg.ptr = &tsMinSlidingTime;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
@@ -495,45 +415,6 @@ static void doInitGlobalConfig(void) {
   taosAddConfigOption(cfg);
 
 
-  cfg.option = "maxConnections";
-  cfg.ptr = &tsMaxConnections;
-  cfg.valType = TAOS_CFG_VTYPE_INT32;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 1;
-  cfg.maxValue = 100000;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosAddConfigOption(cfg);
-
-  cfg.option = "minimalLogDirGB";
-  cfg.ptr = &tsMinimalLogDirGB;
-  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 0.001f;
-  cfg.maxValue = 10000000;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_GB;
-  taosAddConfigOption(cfg);
-
-  cfg.option = "minimalTmpDirGB";
-  cfg.ptr = &tsReservedTmpDirectorySpace;
-  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 0.001f;
-  cfg.maxValue = 10000000;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_GB;
-  taosAddConfigOption(cfg);
-
-  cfg.option = "minimalDataDirGB";
-  cfg.ptr = &tsMinimalDataDirGB;
-  cfg.valType = TAOS_CFG_VTYPE_FLOAT;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW;
-  cfg.minValue = 0.001f;
-  cfg.maxValue = 10000000;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_GB;
-  taosAddConfigOption(cfg);
 
   cfg.option = "slaveQuery";
   cfg.ptr = &tsEnableSlaveQuery;
@@ -557,17 +438,6 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosAddConfigOption(cfg);
 
-  cfg.option = "enableCoreFile";
-  cfg.ptr = &tsEnableCoreFile;
-  cfg.valType = TAOS_CFG_VTYPE_INT8;
-  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG;
-  cfg.minValue = 0;
-  cfg.maxValue = 1;
-  cfg.ptrLength = 0;
-  cfg.unitType = TAOS_CFG_UTYPE_NONE;
-  taosAddConfigOption(cfg);
-
-
   cfg.option = "maxBinaryDisplayWidth";
   cfg.ptr = &tsMaxBinaryDisplayWidth;
   cfg.valType = TAOS_CFG_VTYPE_INT32;
diff --git a/source/dnode/mgmt/daemon/inc/dmnInt.h b/source/dnode/mgmt/daemon/inc/dmnInt.h
index 7ffb0bdeb7..19ec147769 100644
--- a/source/dnode/mgmt/daemon/inc/dmnInt.h
+++ b/source/dnode/mgmt/daemon/inc/dmnInt.h
@@ -22,6 +22,7 @@
 #include "taoserror.h"
 #include "tglobal.h"
 #include "ulog.h"
+#include "version.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/dnode/mgmt/daemon/src/dmnCfg.c b/source/dnode/mgmt/daemon/src/dmnCfg.c
index 85a9a28750..7bf538caed 100644
--- a/source/dnode/mgmt/daemon/src/dmnCfg.c
+++ b/source/dnode/mgmt/daemon/src/dmnCfg.c
@@ -41,17 +41,17 @@ static int32_t dmnAddEpCfg(SConfig *pCfg) {
 
 static int32_t dmnAddDirCfg(SConfig *pCfg) {
   if (cfgAddDir(pCfg, "dataDir", tsDataDir) != 0) return -1;
-  if (cfgAddDir(pCfg, "tmpDir", tsTempDir) != 0) return -1;
+  if (cfgAddDir(pCfg, "tempDir", tsTempDir) != 0) return -1;
+  if (cfgAddFloat(pCfg, "minimalDataDirGB", 2.0f, 0.001f, 10000000) != 0) return -1;
+  if (cfgAddFloat(pCfg, "minimalTempDirGB", 1.0f, 0.001f, 10000000) != 0) return -1;
   return 0;
 }
+
 static int32_t dmnCheckDirCfg(SConfig *pCfg) {
-  SConfigItem *pItem = NULL;
-
-  pItem = cfgGetItem(pCfg, "tmpDir");
-  if (taosDirExist(pItem->str) != 0) {
-    return -1;
-  }
-
+  tstrncpy(tsDataDir, cfgGetItem(pCfg, "dataDir")->str, PATH_MAX);
+  tstrncpy(tsTempDir, cfgGetItem(pCfg, "tempDir")->str, PATH_MAX);
+  tsDataSpace.reserved = cfgGetItem(pCfg, "minimalDataDirGB")->fval;
+  tsTempSpace.reserved = cfgGetItem(pCfg, "minimalTempDirGB")->fval;
   return 0;
 }
 
diff --git a/source/dnode/mgmt/daemon/src/dmnLog.c b/source/dnode/mgmt/daemon/src/dmnLog.c
index 3ec43cb7f3..22a7d7b080 100644
--- a/source/dnode/mgmt/daemon/src/dmnLog.c
+++ b/source/dnode/mgmt/daemon/src/dmnLog.c
@@ -18,6 +18,7 @@
 
 int32_t dmnAddLogCfg(SConfig *pCfg) {
   if (cfgAddDir(pCfg, "logDir", "/var/log/taos") != 0) return -1;
+  if (cfgAddFloat(pCfg, "minimalLogDirGB", 1.0f, 0.001f, 10000000) != 0) return -1;
   if (cfgAddBool(pCfg, "asyncLog", 1) != 0) return -1;
   if (cfgAddInt32(pCfg, "numOfLogLines", 10000000, 1000, 2000000000) != 0) return -1;
   if (cfgAddInt32(pCfg, "logKeepDays", 0, -365000, 365000) != 0) return -1;
@@ -41,6 +42,7 @@ int32_t dmnAddLogCfg(SConfig *pCfg) {
 
 int32_t dmnSetLogCfg(SConfig *pCfg) {
   tstrncpy(tsLogDir, cfgGetItem(pCfg, "logDir")->str, PATH_MAX);
+  tsLogSpace.reserved = cfgGetItem(pCfg, "minimalLogDirGB")->fval;
   tsAsyncLog = cfgGetItem(pCfg, "asyncLog")->bval;
   tsNumOfLogLines = cfgGetItem(pCfg, "numOfLogLines")->i32;
   tsLogKeepDays = cfgGetItem(pCfg, "logKeepDays")->i32;
diff --git a/source/dnode/mgmt/impl/src/dndEnv.c b/source/dnode/mgmt/impl/src/dndEnv.c
index 02dced53c2..58517c8151 100644
--- a/source/dnode/mgmt/impl/src/dndEnv.c
+++ b/source/dnode/mgmt/impl/src/dndEnv.c
@@ -325,18 +325,6 @@ void taosGetDisk() {
   SDiskSize    diskSize = tfsGetSize(pTfs);
   
   tfsUpdateSize(&fsMeta);
-  tsTotalDataDirGB = (float)(fsMeta.total / unit);
-  tsUsedDataDirGB = (float)(fsMeta.used / unit);
-  tsAvailDataDirGB = (float)(fsMeta.avail / unit);
 
-  if (taosGetDiskSize(tsLogDir, &diskSize) == 0) {
-    tsTotalLogDirGB = (float)(diskSize.total / unit);
-    tsAvailLogDirGB = (float)(diskSize.avail / unit);
-  }
-
-  if (taosGetDiskSize(tsTempDir, &diskSize) == 0) {
-    tsTotalTmpDirGB = (float)(diskSize.total / unit);
-    tsAvailTmpDirectorySpace = (float)(diskSize.avail / unit);
-  }
 #endif
 }
\ No newline at end of file
diff --git a/source/dnode/mnode/impl/src/mndProfile.c b/source/dnode/mnode/impl/src/mndProfile.c
index df892e2242..2dfdc8dc7f 100644
--- a/source/dnode/mnode/impl/src/mndProfile.c
+++ b/source/dnode/mnode/impl/src/mndProfile.c
@@ -21,6 +21,7 @@
 #include "mndStb.h"
 #include "mndUser.h"
 #include "tglobal.h"
+#include "version.h"
 
 #define QUERY_ID_SIZE 20
 #define QUERY_OBJ_ID_SIZE 18
diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 5508b5ecd7..62c0e3623f 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -132,7 +132,8 @@ do {                                       \
 } while (0)
 
 int32_t getMaximumIdleDurationSec() {
-  return tsShellActivityTimer * 2;
+  // todo
+  return 6; //tsShellActivityTimer * 2;
 }
 
 static int32_t getExprFunctionId(SExprInfo *pExprInfo) {
@@ -5301,10 +5302,12 @@ SOperatorInfo* createExchangeOperatorInfo(const SArray* pSources, const SArray*
     rpcInit.label = "EX";
     rpcInit.numOfThreads = 1;
     rpcInit.cfp = qProcessFetchRsp;
-    rpcInit.sessions = tsMaxConnections;
+    // todo
+    rpcInit.sessions = 50000; //tsMaxConnections;
     rpcInit.connType = TAOS_CONN_CLIENT;
     rpcInit.user = (char *)"root";
-    rpcInit.idleTime = tsShellActivityTimer * 1000;
+    // todo 
+    rpcInit.idleTime = 6; //tsShellActivityTimer * 1000;
     rpcInit.ckey = "key";
     rpcInit.spi = 1;
     rpcInit.secret = (char *)"dcc5bed04851fec854c035b2e40263b6";
diff --git a/source/libs/qcom/src/queryUtil.c b/source/libs/qcom/src/queryUtil.c
index 4cd040c238..b29817a318 100644
--- a/source/libs/qcom/src/queryUtil.c
+++ b/source/libs/qcom/src/queryUtil.c
@@ -85,9 +85,11 @@ static void* pTaskQueue = NULL;
 
 int32_t initTaskQueue() {
   double factor = 4.0;
-  int32_t numOfThreads = TMAX((int)(tsNumOfCores * tsNumOfThreadsPerCore / factor), 2);
+  // todo
+  // int32_t numOfThreads = TMAX((int)(tsNumOfCores * tsNumOfThreadsPerCore / factor), 2);
+  int32_t numOfThreads = TMAX((int)(tsNumOfCores * 1.0f / factor), 2);
 
-  int32_t queueSize = tsMaxConnections * 2;
+  int32_t queueSize = 25000; //tsMaxConnections * 2;
   pTaskQueue = taosInitScheduler(queueSize, numOfThreads, "tsc");
   if (NULL == pTaskQueue) {
     qError("failed to init task queue");
diff --git a/source/libs/transport/src/rpcMain.c b/source/libs/transport/src/rpcMain.c
index 72c1ff6893..44bb6fdb70 100644
--- a/source/libs/transport/src/rpcMain.c
+++ b/source/libs/transport/src/rpcMain.c
@@ -42,6 +42,8 @@ int tsRpcMaxRetry;
 int tsRpcHeadSize;
 int tsRpcOverhead;
 
+int32_t tsRpcForceTcp = 1;   // disable this, means query, show command use udp protocol as default
+
 SHashObj *tsFqdnHash;
 
 #ifndef USE_UV
@@ -143,6 +145,10 @@ typedef struct SRpcConn {
 
 static int     tsRpcRefId = -1;
 static int32_t tsRpcNum = 0;
+
+int32_t tsRpcTimer = 300;
+int32_t tsRpcMaxTime = 600;  // seconds;
+
 // static pthread_once_t tsRpcInit = PTHREAD_ONCE_INIT;
 
 // server:0 client:1  tcp:2 udp:0
diff --git a/source/libs/transport/test/rsclient.c b/source/libs/transport/test/rsclient.c
index f9bcc3da96..26a02eb05b 100644
--- a/source/libs/transport/test/rsclient.c
+++ b/source/libs/transport/test/rsclient.c
@@ -97,7 +97,7 @@ int main(int argc, char *argv[]) {
   rpcInit.label        = "APP";
   rpcInit.numOfThreads = 1;
   rpcInit.sessions     = 100;
-  rpcInit.idleTime     = tsShellActivityTimer*1000;
+  rpcInit.idleTime     = 3000; //tsShellActivityTimer*1000;
   rpcInit.user         = "michael";
   rpcInit.secret       = secret;
   rpcInit.ckey         = "key";
diff --git a/source/os/src/osEnv.c b/source/os/src/osEnv.c
index 38e564fa9d..b90d9fbe94 100644
--- a/source/os/src/osEnv.c
+++ b/source/os/src/osEnv.c
@@ -16,6 +16,30 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
+#include "osEnv.h"
+#include "osSysinfo.h"
+
+SDiskSpace tsLogSpace;
+SDiskSpace tsTempSpace;
+SDiskSpace tsDataSpace;
+
+void taosUpdateLogSpace() { taosGetDiskSize(tsLogDir, &tsLogSpace.size); }
+
+void taosUpdateTempSpace() { taosGetDiskSize(tsTempDir, &tsTempSpace.size); }
+
+void taosUpdateDataSpace() { taosGetDiskSize(tsDataDir, &tsDataSpace.size); }
+
+bool taosLogSpaceAvailable() { return tsLogSpace.reserved < tsLogSpace.size.avail; }
+
+bool taosTempSpaceAvailable() { return tsTempSpace.reserved < tsTempSpace.size.avail; }
+
+bool taosDataSpaceAvailable() { return tsDataSpace.reserved < tsDataSpace.size.avail; }
+
+void taosUpdateAllSpace() {
+  taosUpdateLogSpace();
+  taosUpdateTempSpace();
+  taosUpdateDataSpace();
+}
 
 #if defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
 
diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c
index ecd0f0437b..f5d02df80d 100644
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -72,9 +72,6 @@ int8_t tscEmbeddedInUtil = 0;
 int32_t tsLogKeepDays = 0;
 bool    tsAsyncLog = true;
 bool    tsLogInited = false;
-float   tsTotalLogDirGB = 0;
-float   tsAvailLogDirGB = 0;
-float   tsMinimalLogDirGB = 1.0f;
 int64_t asyncLogLostLines = 0;
 int32_t writeInterval = DEFAULT_LOG_INTERVAL;
 
@@ -122,6 +119,7 @@ static int32_t taosStartLog() {
 
 int32_t taosInitLog(const char *logName, int maxFiles) {
   if (tsLogInited) return 0;
+  taosUpdateLogSpace();
 
   char fullName[PATH_MAX] = {0};
   snprintf(fullName, PATH_MAX, "%s" TD_DIRSEP "%s", tsLogDir, logName);
@@ -383,12 +381,7 @@ static int32_t taosOpenLogFile(char *fn, int32_t maxLines, int32_t maxFileNum) {
 }
 
 void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) {
-  if (tsTotalLogDirGB != 0 && tsAvailLogDirGB < tsMinimalLogDirGB) {
-    printf("server disk:%s space remain %.3f GB, total %.1f GB, stop print log.\n", tsLogDir, tsAvailLogDirGB,
-           tsTotalLogDirGB);
-    fflush(stdout);
-    return;
-  }
+  if (!taosLogSpaceAvailable()) return;
 
   va_list        argpointer;
   char           buffer[MAX_LOGLINE_BUFFER_SIZE] = {0};
@@ -443,12 +436,7 @@ void taosPrintLog(const char *flags, int32_t dflag, const char *format, ...) {
 }
 
 void taosDumpData(unsigned char *msg, int32_t len) {
-  if (tsTotalLogDirGB != 0 && tsAvailLogDirGB < tsMinimalLogDirGB) {
-    printf("server disk:%s space remain %.3f GB, total %.1f GB, stop dump log.\n", tsLogDir, tsAvailLogDirGB,
-           tsTotalLogDirGB);
-    fflush(stdout);
-    return;
-  }
+  if (!taosLogSpaceAvailable()) return;
 
   char    temp[256];
   int32_t i, pos = 0, c = 0;
@@ -471,12 +459,7 @@ void taosDumpData(unsigned char *msg, int32_t len) {
 }
 
 void taosPrintLongString(const char *flags, int32_t dflag, const char *format, ...) {
-  if (tsTotalLogDirGB != 0 && tsAvailLogDirGB < tsMinimalLogDirGB) {
-    printf("server disk:%s space remain %.3f GB, total %.1f GB, stop write log.\n", tsLogDir, tsAvailLogDirGB,
-           tsTotalLogDirGB);
-    fflush(stdout);
-    return;
-  }
+  if (!taosLogSpaceAvailable()) return;
 
   va_list        argpointer;
   char           buffer[MAX_LOGLINE_DUMP_BUFFER_SIZE];
diff --git a/tools/shell/src/shellLinux.c b/tools/shell/src/shellLinux.c
index 81d8c0a35b..89b477f08a 100644
--- a/tools/shell/src/shellLinux.c
+++ b/tools/shell/src/shellLinux.c
@@ -20,6 +20,7 @@
 #include "shellCommand.h"
 #include "tkey.h"
 #include "ulog.h"
+#include "version.h"
 
 #include <wordexp.h>
 #include <argp.h>