[td-168] merge develop

b58b8ef7 · hjxilinx · 547a7752 · 7dcbe810 · b58b8ef7 · b58b8ef7
41 changed file
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -424,8 +424,8 @@ int tdMergeDataCols(SDataCols *target, SDataCols *source, int rowsToMerge) {
        dataColAppendVal(target->cols + j, tdGetColDataOfRow(source->cols + j, i), target->numOfPoints,
                         target->maxPoints);
      }
+      target->numOfPoints++;
    }
-    target->numOfPoints++;
  } else {
    pTarget = tdDupDataCols(target, true);
    if (pTarget == NULL) goto _err;

--- a/src/inc/vnode.h
+++ b/src/inc/vnode.h
@@ -22,7 +22,7 @@ extern "C" {

 typedef enum _VN_STATUS {
  TAOS_VN_STATUS_INIT,
-  TAOS_VN_STATUS_CREATING,
+  TAOS_VN_STATUS_UPDATING,
  TAOS_VN_STATUS_READY,
  TAOS_VN_STATUS_CLOSING,
  TAOS_VN_STATUS_DELETING,

--- a/src/mnode/src/mgmtDb.c
+++ b/src/mnode/src/mgmtDb.c
@@ -480,7 +480,7 @@ static int32_t mgmtGetDbMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pConn)
  }
 #endif

-  pShow->bytes[cols] = 24;
+  pShow->bytes[cols] = 24 + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "keep1,keep2,keep(D)");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);

--- a/src/mnode/src/mgmtDnode.c
+++ b/src/mnode/src/mgmtDnode.c
@@ -491,7 +491,7 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
  cols++;

-  pShow->bytes[cols] = 40;
+  pShow->bytes[cols] = 40 + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "end_point");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
@@ -509,7 +509,7 @@ static int32_t mgmtGetDnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
  cols++;

-  pShow->bytes[cols] = 12;
+  pShow->bytes[cols] = 12 + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "status");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
@@ -609,19 +609,19 @@ static int32_t mgmtGetModuleMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
  cols++;

-  pShow->bytes[cols] = 40;
+  pShow->bytes[cols] = 40 + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "end point");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
  cols++;

-  pShow->bytes[cols] = 8;
+  pShow->bytes[cols] = 8 + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "module");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
  cols++;

-  pShow->bytes[cols] = 8;
+  pShow->bytes[cols] = 8 + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "status");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
@@ -713,13 +713,13 @@ static int32_t mgmtGetConfigMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pC

  SSchema *pSchema = pMeta->schema;

-  pShow->bytes[cols] = TSDB_CFG_OPTION_LEN;
+  pShow->bytes[cols] = TSDB_CFG_OPTION_LEN + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "config name");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
  cols++;

-  pShow->bytes[cols] = TSDB_CFG_VALUE_LEN;
+  pShow->bytes[cols] = TSDB_CFG_VALUE_LEN + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "config value");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
@@ -806,7 +806,7 @@ static int32_t mgmtGetVnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
  cols++;

-  pShow->bytes[cols] = 12;
+  pShow->bytes[cols] = 12 + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "status");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);

--- a/src/mnode/src/mgmtMnode.c
+++ b/src/mnode/src/mgmtMnode.c
@@ -295,7 +295,7 @@ static int32_t mgmtGetMnodeMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
  pSchema[cols].bytes = htons(pShow->bytes[cols]);
  cols++;

-  pShow->bytes[cols] = 12;
+  pShow->bytes[cols] = 12 + VARSTR_HEADER_SIZE;
  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
  strcpy(pSchema[cols].name, "role");
  pSchema[cols].bytes = htons(pShow->bytes[cols]);

--- a/src/mnode/src/mgmtSdb.c
+++ b/src/mnode/src/mgmtSdb.c
@@ -458,6 +458,10 @@ static int sdbWrite(void *param, void *data, int type) {
    // for data from WAL or forward, version may be smaller
    if (pHead->version <= tsSdbObj.version) {
      pthread_mutex_unlock(&tsSdbObj.mutex);
+      if (type == TAOS_QTYPE_FWD && tsSdbObj.sync != NULL) {
+        sdbTrace("forward request is received, version:%" PRIu64 " confirm it", pHead->version);
+        syncConfirmForward(tsSdbObj.sync, pHead->version, TSDB_CODE_SUCCESS);
+      }
      return TSDB_CODE_SUCCESS;
    } else if (pHead->version != tsSdbObj.version + 1) {
      pthread_mutex_unlock(&tsSdbObj.mutex);

--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -32,8 +32,6 @@
 #include "rpcCache.h"
 #include "rpcTcp.h"
 #include "rpcHead.h"
-#include "shash.h"
-

 #define RPC_MSG_OVERHEAD (sizeof(SRpcReqContext) + sizeof(SRpcHead) + sizeof(SRpcDigest)) 
 #define rpcHeadFromCont(cont) ((SRpcHead *) (cont - sizeof(SRpcHead)))
@@ -262,9 +260,7 @@ void *rpcOpen(const SRpcInit *pInit) {
  }

  if (pRpc->connType == TAOS_CONN_SERVER) {
-        pRpc->hash = taosInitStrHash(pRpc->sessions, sizeof(pRpc), taosHashString);
-  
-//    pRpc->hash = taosHashInit(pRpc->sessions, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true);
+    pRpc->hash = taosHashInit(pRpc->sessions, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true);
    if (pRpc->hash == NULL) {
      tError("%s failed to init string hash", pRpc->label);
      rpcClose(pRpc);
@@ -298,8 +294,7 @@ void rpcClose(void *param) {
  (*taosCleanUpConn[pRpc->connType | RPC_CONN_TCP])(pRpc->tcphandle);
  (*taosCleanUpConn[pRpc->connType])(pRpc->udphandle);

-//  taosHashCleanup(pRpc->hash);
-  taosCleanUpStrHash(pRpc->hash);
+  taosHashCleanup(pRpc->hash);
  taosTmrCleanUp(pRpc->tmrCtrl);
  taosIdPoolCleanUp(pRpc->idPool);
  rpcCloseConnCache(pRpc->pCache);
@@ -548,9 +543,8 @@ static void rpcCloseConn(void *thandle) {

  if ( pRpc->connType == TAOS_CONN_SERVER) {
    char hashstr[40] = {0};
-    /*size_t size = */sprintf(hashstr, "%x:%x:%x:%d", pConn->peerIp, pConn->linkUid, pConn->peerId, pConn->connType);
-//    taosHashRemove(pRpc->hash, hashstr, size);
-    taosDeleteStrHash(pRpc->hash, hashstr);
+    size_t size = sprintf(hashstr, "%x:%x:%x:%d", pConn->peerIp, pConn->linkUid, pConn->peerId, pConn->connType);
+    taosHashRemove(pRpc->hash, hashstr, size);
  
    rpcFreeMsg(pConn->pRspMsg); // it may have a response msg saved, but not request msg
    pConn->pRspMsg = NULL;
@@ -599,12 +593,10 @@ static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv) {
  char      hashstr[40] = {0};
  SRpcHead *pHead = (SRpcHead *)pRecv->msg;

-  /*size_t size = */sprintf(hashstr, "%x:%x:%x:%d", pRecv->ip, pHead->linkUid, pHead->sourceId, pRecv->connType);
+  size_t size = sprintf(hashstr, "%x:%x:%x:%d", pRecv->ip, pHead->linkUid, pHead->sourceId, pRecv->connType);
 
  // check if it is already allocated
-  SRpcConn **ppConn = (SRpcConn **)(taosGetStrHashData(pRpc->hash, hashstr));
-  
-//  SRpcConn **ppConn = (SRpcConn **)(taosHashGet(pRpc->hash, hashstr, size));
+  SRpcConn **ppConn = (SRpcConn **)(taosHashGet(pRpc->hash, hashstr, size));
  if (ppConn) pConn = *ppConn;
  if (pConn) return pConn;

@@ -638,10 +630,7 @@ static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv) {
      pConn->localPort = (pRpc->localPort + pRpc->index);
    }
  
-    taosAddStrHash(pRpc->hash, hashstr, (char *)&pConn);
-  
-//    taosHashPut(pRpc->hash, hashstr, size, (char *)&pConn, POINTER_BYTES);
-    
+    taosHashPut(pRpc->hash, hashstr, size, (char *)&pConn, POINTER_BYTES);
    tTrace("%s %p, rpc connection is allocated, sid:%d id:%s port:%u", 
           pRpc->label, pConn, sid, pConn->user, pConn->localPort);
  }
@@ -803,6 +792,7 @@ static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) {
  sid = pConn->sid;

  pConn->chandle = pRecv->chandle;
+  pConn->peerIp = pRecv->ip; 
  if (pConn->peerPort == 0) pConn->peerPort = pRecv->port;
  if (pHead->port) pConn->peerPort = htons(pHead->port); 


--- a/src/util/inc/tcoding.h
+++ b/src/util/inc/tcoding.h
+/*
+ * 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_CODING_H_
+#define _TD_CODING_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <string.h>
+
+#include "tutil.h"
+
+const int TNUMBER = 1;
+#define IS_LITTLE_ENDIAN() (*(char *)(&TNUMBER) != 0)
+
+static FORCE_INLINE void *taosEncodeFixed16(void *buf, uint16_t value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(buf, &value, sizeof(value));
+  } else {
+    ((char *)buf)[0] = value & 0xff;
+    ((char *)buf)[1] = (value >> 8) & 0xff;
+  }
+
+  return POINTER_DRIFT(buf, sizeof(value));
+}
+
+static FORCE_INLINE void *taosEncodeFixed32(void *buf, uint32_t value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(buf, &value, sizeof(value));
+  } else {
+    ((char *)buf)[0] = value & 0xff;
+    ((char *)buf)[1] = (value >> 8) & 0xff;
+    ((char *)buf)[2] = (value >> 16) & 0xff;
+    ((char *)buf)[3] = (value >> 24) & 0xff;
+  }
+
+  return POINTER_DRIFT(buf, sizeof(value));
+}
+
+static FORCE_INLINE void *taosEncodeFixed64(void *buf, uint64_t value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(buf, &value, sizeof(value));
+  } else {
+    ((char *)buf)[0] = value & 0xff;
+    ((char *)buf)[1] = (value >> 8) & 0xff;
+    ((char *)buf)[2] = (value >> 16) & 0xff;
+    ((char *)buf)[3] = (value >> 24) & 0xff;
+    ((char *)buf)[4] = (value >> 32) & 0xff;
+    ((char *)buf)[5] = (value >> 40) & 0xff;
+    ((char *)buf)[6] = (value >> 48) & 0xff;
+    ((char *)buf)[7] = (value >> 56) & 0xff;
+  }
+
+  return POINTER_DRIFT(buf, sizeof(value));
+}
+
+static FORCE_INLINE void *taosDecodeFixed16(void *buf, uint16_t *value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(value, buf, sizeof(*value));
+  } else {
+    ((char *)value)[1] = ((char *)buf)[0];
+    ((char *)value)[0] = ((char *)buf)[1];
+  }
+
+  return POINTER_DRIFT(buf, sizeof(*value));
+}
+
+static FORCE_INLINE void *taosDecodeFixed32(void *buf, uint32_t *value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(value, buf, sizeof(*value));
+  } else {
+    ((char *)value)[3] = ((char *)buf)[0];
+    ((char *)value)[2] = ((char *)buf)[1];
+    ((char *)value)[1] = ((char *)buf)[2];
+    ((char *)value)[0] = ((char *)buf)[3];
+  }
+
+  return POINTER_DRIFT(buf, sizeof(*value));
+}
+
+static FORCE_INLINE void *taosDecodeFixed64(void *buf, uint64_t *value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(value, buf, sizeof(*value));
+  } else {
+    ((char *)value)[7] = ((char *)buf)[0];
+    ((char *)value)[6] = ((char *)buf)[1];
+    ((char *)value)[5] = ((char *)buf)[2];
+    ((char *)value)[4] = ((char *)buf)[3];
+    ((char *)value)[3] = ((char *)buf)[4];
+    ((char *)value)[2] = ((char *)buf)[5];
+    ((char *)value)[1] = ((char *)buf)[6];
+    ((char *)value)[0] = ((char *)buf)[7];
+  }
+
+  return POINTER_DRIFT(buf, sizeof(*value));
+}
+
+// TODO
+static FORCE_INLINE void *taosEncodeVariant16(void *buf, uint16_t value) {}
+static FORCE_INLINE void *taosEncodeVariant32(void *buf, uint32_t value) {}
+static FORCE_INLINE void *taosEncodeVariant64(void *buf, uint64_t value) {}
+static FORCE_INLINE void *taosDecodeVariant16(void *buf, uint16_t *value) {}
+static FORCE_INLINE void *taosDecodeVariant32(void *buf, uint32_t *value) {}
+static FORCE_INLINE void *taosDecodeVariant64(void *buf, uint64_t *value) {}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -140,6 +140,8 @@ int32_t vnodeDrop(int32_t vgId) {

 int32_t vnodeAlter(void *param, SMDCreateVnodeMsg *pVnodeCfg) {
  SVnodeObj *pVnode = param;
+  pVnode->status = TAOS_VN_STATUS_UPDATING;
+
  int32_t code = vnodeSaveCfg(pVnodeCfg);
  if (code != TSDB_CODE_SUCCESS) {
    dError("vgId:%d, failed to save vnode cfg, reason:%s", pVnodeCfg->cfg.vgId, tstrerror(code));
@@ -167,6 +169,8 @@ int32_t vnodeAlter(void *param, SMDCreateVnodeMsg *pVnodeCfg) {
    return code;
  }

+  pVnode->status = TAOS_VN_STATUS_READY;
+
  dTrace("pVnode:%p vgId:%d, vnode is altered", pVnode, pVnode->vgId);
  return TSDB_CODE_SUCCESS;
 }
@@ -181,7 +185,7 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
  pVnode->refCount = 1;
  pVnode->version  = 0;  
  taosAddIntHash(tsDnodeVnodesHash, pVnode->vgId, (char *)(&pVnode));
-
+  
  int32_t code = vnodeReadCfg(pVnode);
  if (code != TSDB_CODE_SUCCESS) {
    dError("pVnode:%p vgId:%d, failed to read cfg file", pVnode, pVnode->vgId);

--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -51,7 +51,7 @@ int32_t vnodeProcessWrite(void *param1, int qtype, void *param2, void *item) {
  if (vnodeProcessWriteMsgFp[pHead->msgType] == NULL) 
    return TSDB_CODE_MSG_NOT_PROCESSED; 

-  if (pVnode->status == TAOS_VN_STATUS_DELETING || pVnode->status == TAOS_VN_STATUS_CLOSING) 
+  if (pVnode->status != TAOS_VN_STATUS_READY) 
    return TSDB_CODE_NOT_ACTIVE_VNODE; 

  if (pHead->version == 0) { // from client 

--- a/tests/script/general/http/restful.sim
+++ b/tests/script/general/http/restful.sim
 system sh/stop_dnodes.sh
-
 sleep 5000
-
-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/exec.sh -n dnode1 -s start


--- a/tests/script/general/http/restful_full.sim
+++ b/tests/script/general/http/restful_full.sim
 system sh/stop_dnodes.sh
-
-#sleep 5000
-
-
+sleep 5000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
 system sh/exec.sh -n dnode1 -s start

 #sleep 3000
@@ -14,57 +12,57 @@ print ============================ dnode1 start

 print ===============  step1 - login

-system_content curl 192.168.0.1:6020/rest/
+system_content curl 127.0.0.1:6020/rest/
 print 1-> $system_content
 if $system_content != @{"status":"error","code":1011,"desc":"no auth info input"}@ then
  return -1
 endi

-system_content curl 192.168.0.1:6020/rest/xx
+system_content curl 127.0.0.1:6020/rest/xx
 print 2-> $system_content
 if $system_content != @{"status":"error","code":1011,"desc":"no auth info input"}@ then
  return -1
 endi

-system_content curl 192.168.0.1:6020/rest/login
+system_content curl 127.0.0.1:6020/rest/login
 print 3-> $system_content
 if $system_content != @{"status":"error","code":1011,"desc":"no auth info input"}@ then
  return -1
 endi

 #4
-system_content curl 192.168.0.1:6020/rest/login/root
+system_content curl 127.0.0.1:6020/rest/login/root
 print 4-> $system_content
 if $system_content != @{"status":"error","code":1011,"desc":"no auth info input"}@ then
  return -1
 endi

-system_content curl 192.168.0.1:6020/rest/login/root/123
+system_content curl 127.0.0.1:6020/rest/login/root/123
 print 5-> $system_content
 if $system_content != @{"status":"error","code":1000,"desc":"auth failure"}@ then
  return -1
 endi

-system_content curl 192.168.0.1:6020/rest/login/root/123/1/1/3
+system_content curl 127.0.0.1:6020/rest/login/root/123/1/1/3
 print 6-> $system_content
 if $system_content != @{"status":"error","code":1000,"desc":"auth failure"}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 192.168.0.1:6020/rest/login/root/1
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:6020/rest/login/root/1
 print 7-> $system_content
 if $system_content != @{"status":"error","code":1000,"desc":"auth failure"}@ then
  return -1
 endi

 #8
-system_content curl -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi'  -d 'show databases' 192.168.0.1:6020/rest/login/root/1
+system_content curl -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi'  -d 'show databases' 127.0.0.1:6020/rest/login/root/1
 print 8-> $system_content
 if $system_content != @{"status":"error","code":1010,"desc":"invalid type of Authorization"}@ then
  return -1
 endi

-system_content curl -H 'Authorization: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi'  -d 'show databases' 192.168.0.1:6020/rest/login/root/1
+system_content curl -H 'Authorization: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi'  -d 'show databases' 127.0.0.1:6020/rest/login/root/1
 print 9-> $system_content
 if $system_content != @{"status":"error","code":1010,"desc":"invalid type of Authorization"}@ then
  return -1
@@ -72,7 +70,7 @@ endi

 sleep 3000

-system_content curl 192.168.0.1:6020/rest/login/root/taosdata/
+system_content curl 127.0.0.1:6020/rest/login/root/taosdata/
 print 10-> $system_content
 if $system_content != @{"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04"}@ then
  return -1
@@ -81,52 +79,52 @@ endi
 print ===============  step2 - no db

 #11
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:6020/rest/sql
 print 11-> $system_content
 if $system_content != @{"status":"succ","head":["name","create time","ntables","vgroups","replica","days","keep1,keep2,keep(D)","tables","cache(MB)","blocks","minrows","maxrows","ctime(s)","clog","comp","precision","status"],"data":[],"rows":0}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d1' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d1' 127.0.0.1:6020/rest/sql
 print 12-> $system_content
 if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[0]],"rows":0}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d1' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d1' 127.0.0.1:6020/rest/sql
 print 13-> $system_content
 if $system_content != @{"status":"error","code":1000,"desc":"DB already there"}@ then
  return -1
 endi

 #14
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d '' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d '' 127.0.0.1:6020/rest/sql
 print 14-> $system_content
 if $system_content != @{"status":"error","code":1012,"desc":"no sql input"}@ then
  return -1
 endi

-#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'use d1' 192.168.0.1:6020/rest/sql
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'use d1' 127.0.0.1:6020/rest/sql
 #print 15-> $system_content
 #if $system_content != @{"status":"error","code":1017,"desc":"no need to execute use db cmd"}@ then
 #if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[1]],"rows":1}@ then
 #  return -1
 #endi

-#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d '  use d1' 192.168.0.1:6020/rest/sql
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d '  use d1' 127.0.0.1:6020/rest/sql
 #print 16-> $system_content
 #if $system_content != @{"status":"error","code":1017,"desc":"no need to execute use db cmd"}@ then
 #  return -1
 #endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d '  used1' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d '  used1' 127.0.0.1:6020/rest/sql
 print 17-> $system_content
 if $system_content != @{"status":"error","code":1000,"desc":"invalid SQL: invalid SQL: syntax error near 'used1'"}@ then
  return -1
 endi

 #18
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 127.0.0.1:6020/rest/sql
 print 18-> $system_content
 if $system_content != @{"status":"error","code":1000,"desc":"db not selected"}@ then
  return -1
@@ -135,44 +133,44 @@ endi
 print ===============  step3 - db

 #19
-#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 192.168.0.1:6020/rest/sql/d4
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 127.0.0.1:6020/rest/sql/d4
 #print 19-> $system_content
 #if $system_content != @{"status":"error","code":1000,"desc":"invalid DB"}@ then
 #  return -1
 #endi

-#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 192.168.0.1:6020/rest/sql/d1
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' show tables;' 127.0.0.1:6020/rest/sql/d1
 #print 20-> $system_content
 #if $system_content != @{"status":"succ","head":["name","created time","columns","metric"],"data":[],"rows":0}@ then
 #  return -1
 #endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1;' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1;' 127.0.0.1:6020/rest/sql
 print 21-> $system_content
 if $system_content != @{"status":"error","code":1000,"desc":"invalid table name"}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' create table d1.t1 (ts timestamp, speed int)' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' create table d1.t1 (ts timestamp, speed int)' 127.0.0.1:6020/rest/sql
 print 22-> $system_content
 if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[0]],"rows":0}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1 ' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1 ' 127.0.0.1:6020/rest/sql
 print 23-> $system_content
 if $system_content != @{"status":"succ","head":["ts","speed"],"data":[],"rows":0}@ then
  return -1
 endi

 #24
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:41.022', 1)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:41.022', 1)" 127.0.0.1:6020/rest/sql
 print 24-> $system_content
 if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[1]],"rows":1}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1 ' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1 ' 127.0.0.1:6020/rest/sql
 print 25-> $system_content
 if $system_content != @{"status":"succ","head":["ts","speed"],"data":[["2017-12-25 21:28:41.022",1]],"rows":1}@ then
  return -1
@@ -180,53 +178,53 @@ endi

 #26
 print 25-> no print
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:42.022', 2)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:42.022', 2)" 127.0.0.1:6020/rest/sql

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:43.022', 3)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:43.022', 3)" 127.0.0.1:6020/rest/sql

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:44.022', 4)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:44.022', 4)" 127.0.0.1:6020/rest/sql

-system_content  curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:45.022', 5)" 192.168.0.1:6020/rest/sql
+system_content  curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:45.022', 5)" 127.0.0.1:6020/rest/sql

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:46.022', 6)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:46.022', 6)" 127.0.0.1:6020/rest/sql

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:47.022', 7)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:47.022', 7)" 127.0.0.1:6020/rest/sql

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:48.022', 8)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:48.022', 8)" 127.0.0.1:6020/rest/sql

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:49.022', 9)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:49.022', 9)" 127.0.0.1:6020/rest/sql

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:50.022', 10)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:50.022', 10)" 127.0.0.1:6020/rest/sql

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:51.022', 11)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d1.t1 values('2017-12-25 21:28:51.022', 11)" 127.0.0.1:6020/rest/sql

 #27
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1 ' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1 ' 127.0.0.1:6020/rest/sql
 print 27-> $system_content
 if $system_content != @{"status":"succ","head":["ts","speed"],"data":[["2017-12-25 21:28:41.022",1],["2017-12-25 21:28:42.022",2],["2017-12-25 21:28:43.022",3],["2017-12-25 21:28:44.022",4],["2017-12-25 21:28:45.022",5],["2017-12-25 21:28:46.022",6],["2017-12-25 21:28:47.022",7],["2017-12-25 21:28:48.022",8],["2017-12-25 21:28:49.022",9],["2017-12-25 21:28:50.022",10],["2017-12-25 21:28:51.022",11]],"rows":11}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d2' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'create database d2' 127.0.0.1:6020/rest/sql
 print 28-> $system_content
 if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[0]],"rows":0}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' create table d2.t1 (ts timestamp, speed int)' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' create table d2.t1 (ts timestamp, speed int)' 127.0.0.1:6020/rest/sql
 print 29-> $system_content
 if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[0]],"rows":0}@ then
  return -1
 endi

 #30
-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d2.t1 values('2017-12-25 21:28:41.022', 1)" 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d "insert into d2.t1 values('2017-12-25 21:28:41.022', 1)" 127.0.0.1:6020/rest/sql
 print 30-> $system_content
 if $system_content != @{"status":"succ","head":["affected_rows"],"data":[[1]],"rows":1}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d2.t1 ' 192.168.0.1:6020/rest/sql
+system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d2.t1 ' 127.0.0.1:6020/rest/sql
 print 31-> $system_content
 if $system_content != @{"status":"succ","head":["ts","speed"],"data":[["2017-12-25 21:28:41.022",1]],"rows":1}@ then
  return -1

--- a/tests/script/general/user/user_create.sim
+++ b/tests/script/general/user/user_create.sim
@@ -49,19 +49,22 @@ sleep 2000

 sql alter user read privilege read
 sql show users
-if $data1_read != read then 
+print $data1_read
+if $data1_read != readable then 
  return -1
 endi

 sql_error alter user read privilege super
 sql show users
-if $data1_read != read then
+print $data1_read
+if $data1_read != readable then
  return -1
 endi

 sql alter user read privilege write
 sql show users
-if $data1_read != write then 
+print $data1_read
+if $data1_read != writable then 
  return -1
 endi


--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@@ -106,6 +106,7 @@ echo "httpDebugFlag       135"            >> $TAOS_CFG
 echo "monitorDebugFlag    131"            >> $TAOS_CFG
 echo "udebugFlag          131"            >> $TAOS_CFG
 echo "jnidebugFlag        131"            >> $TAOS_CFG
+echo "sdebugFlag          135"            >> $TAOS_CFG
 echo "monitor             0"              >> $TAOS_CFG
 echo "http                0"              >> $TAOS_CFG
 echo "numOfThreadsPerCore 2.0"            >> $TAOS_CFG

--- a/tests/script/unique/account/pass_alter.sim
+++ b/tests/script/unique/account/pass_alter.sim
@@ -43,6 +43,7 @@ step3:

 print ============= step4
 sql close 
+sleep 1000
 sql connect
 sleep 2000
 sql create account oroot pass 'taosdata'

--- a/tests/script/unique/account/testSuite.sim
+++ b/tests/script/unique/account/testSuite.sim
@@ -4,7 +4,7 @@ run unique/account/account_len.sim
 run unique/account/authority.sim
 run unique/account/basic.sim
 run unique/account/paras.sim
-run unique/account/pass_alter.sim
+#run unique/account/pass_alter.sim
 run unique/account/pass_len.sim
 run unique/account/usage.sim
 run unique/account/user_create.sim

--- a/tests/script/unique/account/user_create.sim
+++ b/tests/script/unique/account/user_create.sim
@@ -49,19 +49,21 @@ sleep 2000

 sql alter user read privilege read
 sql show users
-if $data1_read != read then 
+print $data1_read
+if $data1_read != readable then 
  return -1
 endi

 sql_error alter user read privilege super
 sql show users
-if $data1_read != read then
+print $data1_read
+if $data1_read != readable then
  return -1
 endi

 sql alter user read privilege write
 sql show users
-if $data1_read != write then 
+if $data1_read != writable then 
  return -1
 endi


--- a/tests/script/unique/cluster/balance1.sim
+++ b/tests/script/unique/cluster/balance1.sim
@@ -3,30 +3,50 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
-
-system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+system sh/deploy.sh -n dnode8 -i 8

 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode3 -c clog -v 1
-system sh/cfg.sh -n dnode4 -c clog -v 1
+system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode8 -c numOfTotalVnodes -v 4
+
+system sh/cfg.sh -n dnode1 -c numOfMpeers -v 3
+system sh/cfg.sh -n dnode2 -c numOfMpeers -v 3
+system sh/cfg.sh -n dnode3 -c numOfMpeers -v 3
+system sh/cfg.sh -n dnode4 -c numOfMpeers -v 3
+system sh/cfg.sh -n dnode5 -c numOfMpeers -v 3
+system sh/cfg.sh -n dnode6 -c numOfMpeers -v 3
+system sh/cfg.sh -n dnode7 -c numOfMpeers -v 3
+system sh/cfg.sh -n dnode8 -c numOfMpeers -v 3

 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 0
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 0
+system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 0
+
+system sh/cfg.sh -n dnode1 -c clog -v 1
+system sh/cfg.sh -n dnode2 -c clog -v 1
+system sh/cfg.sh -n dnode3 -c clog -v 1
+system sh/cfg.sh -n dnode4 -c clog -v 1
+system sh/cfg.sh -n dnode5 -c clog -v 1
+system sh/cfg.sh -n dnode6 -c clog -v 1
+system sh/cfg.sh -n dnode7 -c clog -v 1
+system sh/cfg.sh -n dnode8 -c clog -v 1

 print ============== step1
 print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sql connect

 sql create database c_b1_d1 tables 4
@@ -49,9 +69,9 @@ sql insert into c_b1_t2 values(1520000023022, 22)
 sql insert into c_b1_t2 values(1520000024021, 21)

 sql show dnodes
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 2 then
@@ -65,7 +85,7 @@ print ============================== step2
 print ========= start dnode2
 sleep 2000
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 5000

 $x = 0
@@ -76,27 +96,23 @@ show2:
 	  return -1
 	endi
 sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

-if $dnode1Vnodes != 3 then
+if $dnode1Vnodes != 1 then
  goto show2
 endi
-if $dnode2Vnodes != 3 then
+if $dnode2Vnodes != 1 then
  goto show2
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role

 print ============================== step3
 print ========= add db3
@@ -122,12 +138,12 @@ show4:
 	  return -1
 	endi
 sql show dnodes -x show4
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

-if $dnode1Vnodes != 1 then
+if $dnode1Vnodes != 3 then
  goto show4
 endi
 if $dnode2Vnodes != null then
@@ -135,10 +151,10 @@ if $dnode2Vnodes != null then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -146,16 +162,10 @@ print dnode4 ==> $dnode4Role

 print ============================== step5
 print ========= add dnode2
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 3000
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 sleep 3000
-system sh/exec.sh -n dnode2 -s start
-sql create dnode $hostname2
+system sh/exec_up.sh -n dnode3 -s start
+sql create dnode $hostname3
 sleep 9000

 $x = 0
@@ -166,119 +176,42 @@ show5:
 	  return -1
 	endi
 sql show dnodes -x show5
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
+$dnode3Vnodes = $data2_3
+print dnode2 $dnode3Vnodes

 if $dnode1Vnodes != 2 then
  goto show5
 endi
-if $dnode2Vnodes != 3 then
+if $dnode3Vnodes != 1 then
  goto show5
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role

-print ============================== step6
-print ========= drop dnode1
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-print stop dnode1 and sleep 10000
-sleep 10000
-
-sql drop dnode $hostname1
-print drop dnode1 and sleep 9000
-sleep 9000
-
-$x = 0
-show6: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show6
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != null then
-  goto show6
+if $dnode1Role != master then
+  return -1
 endi
-if $dnode2Vnodes != 1 then
-  goto show6
+if $dnode3Role != slave then
+  return -1
 endi

-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
+print ============================== step6
+sql_error drop dnode $hostname1

 print ============================== step7
-print ========= add dnode1
-sql create dnode $hostname1
-sleep 3000
-system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode1 -c clog -v 1
-system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
-sleep 23000
-system sh/exec.sh -n dnode1 -s start
-sleep 14000
-
-$x = 0
-show7: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show7
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 3 then
-  goto show7
-endi
-if $dnode2Vnodes != 2 then
-  goto show7
-endi
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
+sql_error create dnode $hostname1

 print ============================== step8
-print ========= drop dnode2
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-print stop dnode2 and sleep 10000
-sleep 20000
-sql drop dnode $hostname2
-print drop dnode2 and sleep 9000
-sleep 19000
+sql drop dnode $hostname3
+sleep 15000

 $x = 0
 show8: 
@@ -288,25 +221,23 @@ show8:
 	  return -1
 	endi
 sql show dnodes -x show8
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
+$dnode3Vnodes = $data2_3
+print dnode3 $dnode3Vnodes

-if $dnode1Vnodes != 1 then
+if $dnode1Vnodes != 3 then
  goto show8
 endi
-if $dnode2Vnodes != null then
+if $dnode3Vnodes != null then
  goto show8
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role

@@ -314,16 +245,13 @@ if $dnode1Role != master then
  return -1
 endi

+if $dnode3Role != null then
+  return -1
+endi
+
 print ============================== step9
-print ========= add dnode2
-sql create dnode $hostname2
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
-sleep 3000
-system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname4
+system sh/exec_up.sh -n dnode4 -s start
 sleep 9000

 $x = 0
@@ -334,30 +262,33 @@ show9:
 	  return -1
 	endi
 sql show dnodes -x show9
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 2 then
  goto show9
 endi
-if $dnode2Vnodes != 3 then
+if $dnode4Vnodes != 1 then
  goto show9
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role

+if $dnode1Role != master then
+  return -1
+endi
+
+if $dnode4Role != slave then
+  return -1
+endi
+
 print ============================== step10
-print ========= add db4
 sql create database c_b1_d4 tables 4
 sql use c_b1_d4
 sql create table c_b1_t4 (t timestamp, i int)
@@ -375,102 +306,43 @@ show10:
 	  return -1
 	endi
 sql show dnodes -x show10
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 2 then
   goto show10
 endi
-if $dnode2Vnodes != 2 then
+if $dnode4Vnodes != 2 then
   goto show10
 endi

+sql reset query cache
+
 sql use c_b1_d3
 sql insert into c_b1_t3 values(1520000025036, 36)

 sql use c_b1_d2
 sql insert into c_b1_t2 values(1520000025026, 26)

-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-
-if $dnode1Role != master then
-  return -1
-endi
-
-print ============================== step11
-print ========= drop dnode2
-sleep 2000
-sql drop dnode $hostname2
-sleep 9000
-
-$x = 0
-show11: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 20 then 
-	  return -1
-	endi
-sql show dnodes -x show11
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-if $dnode1Vnodes != 0 then
-   goto show11
-endi
-if $dnode2Vnodes != null then
-   goto show11
-endi
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-
 print ============================== step12
-print ========= add db5
 sql create database c_b1_d5 tables 4
 sql use c_b1_d5
-sql create table c_b1_t5 (t timestamp, i int) -x error3
-print no enough vnodes, but create success
-return -1
-error3:
+sql_error create table c_b1_t5 (t timestamp, i int) -x error3

 print ============================== step13
-print ========= add dnode2
-sql create dnode $hostname2
-system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode2 -c clog -v 1
-system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
-sleep 3000
-system sh/exec.sh -n dnode2 -s start
+sql create dnode $hostname5
+system sh/exec_up.sh -n dnode5 -s start
 sleep 9000

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode4Role = $data2_4
+$dnode5Role = $data2_5
 print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role
+print dnode5 ==> $dnode5Role

 sql use c_b1_d5;
 sql create table c_b1_t5 (t timestamp, i int)
@@ -490,71 +362,27 @@ sql insert into c_b1_t6 values(1520000023062, 62)
 sql insert into c_b1_t6 values(1520000024061, 61)

 sql show dnodes
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-
-#if $dnode1Vnodes != 1 then
-#  return -1
-#endi
-#if $dnode2Vnodes != 1 then
-#  return -1
-#endi
-
-print ============================== step14
-print ========= add dnode3
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-sleep 2000
-sql create dnode $hostname3
-system sh/exec.sh -n dnode3 -s start
-sleep 15000
-
-$x = 0
-show14: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show14
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print dnode3 $dnode3Vnodes
+$dnode4Vnodes = $data2_4
+print dnode4 $dnode2Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode2Vnodes

 if $dnode1Vnodes != 2 then
-  goto show14
+  return -1
 endi
-if $dnode2Vnodes != 2 then
-  goto show14
+if $dnode4Vnodes != 2 then
+  return -1
 endi
-if $dnode3Vnodes != 2 then
-  goto show14
+if $dnode5Vnodes != 2 then
+  return -1
 endi

-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-
-print ============================== step15
-print ========= create db7 db8
+print ============================== step14
+sql create dnode $hostname6
+system sh/exec_up.sh -n dnode6 -s start
+sleep 15000

 sql create database c_b1_d7 tables 4
 sql use c_b1_d7
@@ -574,115 +402,61 @@ sql insert into c_b1_t8 values(1520000022083, 83)
 sql insert into c_b1_t8 values(1520000023082, 82)
 sql insert into c_b1_t8 values(1520000024081, 81)

-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print dnode1 ==> $dnode1Role
-print dnode2 ==> $dnode2Role
-print dnode3 ==> $dnode3Role
-print dnode4 ==> $dnode4Role
-
-print ========== add dnode4
-sleep 2000
-sql create dnode $hostname4
-print sql create dnode $hostname4 over
-system sh/exec.sh -n dnode4 -s start
-print sleep 12000
-sleep 12000
-print sleep 12000 over
-
 $x = 0
-show15: 
+show14: 
 	$x = $x + 1
 	sleep 2000
-	if $x == 15 then 
+	if $x == 30 then
 	  return -1
 	endi
-sql show dnodes -x show15
-$dnode1Vnodes = $data3_192.168.0.1
+sql show dnodes -x show14
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
+$dnode5Vnodes = $data2_5
+print dnode5 $dnode5Vnodes
+$dnode6Vnodes = $data2_6
+print dnode6 $dnode6Vnodes

 if $dnode1Vnodes != 2 then
-  goto show15
-endi
-if $dnode2Vnodes != 2 then
-  goto show15
-endi
-if $dnode3Vnodes != 2 then
-  goto show15
+  goto show14
 endi
 if $dnode4Vnodes != 2 then
-  goto show15
-endi
-
-print ============================== step16
-print ========= drop dnode4, create db9
-
-sql drop dnode $hostname4
-sleep 10000
-sql create database c_b1_d9 tables 4
-sql use c_b1_d9
-sql create table c_b1_t9 (t timestamp, i int)
-sql insert into c_b1_t9 values(1520000020095, 95)
-sql insert into c_b1_t9 values(1520000021094, 94)
-sql insert into c_b1_t9 values(1520000022093, 93)
-sql insert into c_b1_t9 values(1520000023092, 92)
-sql insert into c_b1_t9 values(1520000024091, 91)
-
-system sh/exec.sh -n dnode4 -s stop -x SIGINT
-
-$x = 0
-show16: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 30 then
-	  return -1
-	endi
-sql show dnodes -x show16
-$dnode1Vnodes = $data3_192.168.0.1
-print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print dnode3 $dnode3Vnodes
-
-if $dnode1Vnodes != 1 then
-  goto show16
+  goto show14
 endi
-if $dnode2Vnodes != 1 then
-  goto show16
+if $dnode5Vnodes != 2 then
+  goto show14
 endi
-if $dnode3Vnodes != 1 then
-  goto show16
+if $dnode6Vnodes != 2 then
+  goto show14
 endi

+sql reset query cache
+sleep 1000
+
 print ============================== step17
 print ========= check data

+sql reset query cache
+sleep 1000
+
 sql use c_b1_d1
 sql select * from c_b1_t1
-if $rows != 0 then
+if $rows != 5 then
  return -1
 endi

 sql use c_b1_d2
 sql select * from c_b1_t2
-if $rows == 0 then
+if $rows == 6 then
  return -1
 endi

 sql use c_b1_d3
 sql select * from c_b1_t3 order by t desc
 print $data01 $data11 $data21 $data31 $data41
-if $rows != 1 then
+if $rows != 6 then
  return -1
 endi
 if $data01 != 36 then
@@ -769,31 +543,11 @@ if $data41 != 85 then
  return -1
 endi

-sql use c_b1_d9
-sql select * from c_b1_t9 order by t desc
-print $data01 $data11 $data21 $data31 $data41
-if $data01 != 91 then
-  return -1
-endi
-if $data11 != 92 then
-  return -1
-endi
-if $data21 != 93 then
-  return -1
-endi
-if $data31 != 94 then
-  return -1
-endi
-if $data41 != 95 then
-  return -1
-endi
-
-
 print ============================================ over
-#system sh/exec.sh -n dnode2 -s stop -x SIGINT
-#system sh/exec.sh -n dnode3 -s stop -x SIGINT
-#system sh/exec.sh -n dnode4 -s stop -x SIGINT
-#system sh/exec.sh -n dnode5 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop -x SIGINT



--- a/tests/script/unique/cluster/balance1_bug.sim
+++ b/tests/script/unique/cluster/balance1_bug.sim
@@ -26,7 +26,7 @@ system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0

 print ============== step1
 print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sql connect

 sql create database c_b1_d1 tables 4
@@ -49,9 +49,9 @@ sql insert into c_b1_t2 values(now+4s, 22)
 sql insert into c_b1_t2 values(now+5s, 21)

 sql show dnodes
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 2 then
@@ -65,7 +65,7 @@ print ============================== step2
 print ========= start dnode2
 sleep 2000
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 5000

 $x = 0
@@ -76,9 +76,9 @@ show2:
 	  return -1
 	endi
 sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 3 then
@@ -89,10 +89,10 @@ if $dnode2Vnodes != 3 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -122,9 +122,9 @@ show4:
 	  return -1
 	endi
 sql show dnodes -x show4
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 1 then
@@ -135,10 +135,10 @@ if $dnode2Vnodes != null then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -146,9 +146,9 @@ print dnode4 ==> $dnode4Role

 print ============================== step5
 print ========= add dnode2
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 sleep 5000
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sql create dnode $hostname2
 sleep 9000

@@ -160,9 +160,9 @@ show5:
 	  return -1
 	endi
 sql show dnodes -x show5
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 2 then
@@ -173,10 +173,10 @@ if $dnode2Vnodes != 3 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -184,7 +184,7 @@ print dnode4 ==> $dnode4Role

 print ============================== step6
 print ========= drop dnode1
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 print stop dnode1 and sleep 10000
 sleep 10000

@@ -200,9 +200,9 @@ show6:
 	  return -1
 	endi
 sql show dnodes -x show6
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != null then
@@ -213,10 +213,10 @@ if $dnode2Vnodes != 1 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -226,7 +226,7 @@ print ============================== step7
 print ========= add dnode1
 sql create dnode $hostname1
 sleep 23000
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 14000

 $x = 0
@@ -237,9 +237,9 @@ show7:
 	  return -1
 	endi
 sql show dnodes -x show7
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 3 then
@@ -250,10 +250,10 @@ if $dnode2Vnodes != 2 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -261,7 +261,7 @@ print dnode4 ==> $dnode4Role

 print ============================== step8
 print ========= drop dnode2
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 print stop dnode2 and sleep 10000
 sleep 20000
 sql drop dnode $hostname2
@@ -276,9 +276,9 @@ show8:
 	  return -1
 	endi
 sql show dnodes -x show8
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 1 then
@@ -289,10 +289,10 @@ if $dnode2Vnodes != null then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -305,7 +305,7 @@ endi
 print ============================== step9
 print ========= add dnode2
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 9000

 $x = 0
@@ -316,9 +316,9 @@ show9:
 	  return -1
 	endi
 sql show dnodes -x show9
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 2 then
@@ -329,10 +329,10 @@ if $dnode2Vnodes != 3 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -357,9 +357,9 @@ show10:
 	  return -1
 	endi
 sql show dnodes -x show10
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 2 then
@@ -376,8 +376,8 @@ sql use c_b1_d2
 sql insert into c_b1_t2 values(now+1s, 25)

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role

@@ -399,9 +399,9 @@ show11:
 	  return -1
 	endi
 sql show dnodes -x show11
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 if $dnode1Vnodes != 0 then
@@ -412,16 +412,16 @@ if $dnode2Vnodes != null then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role

-system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT

 print ============================== step12
 print ========= add db5
@@ -435,14 +435,14 @@ error3:
 print ============================== step13
 print ========= add dnode2
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 9000

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -480,9 +480,9 @@ sql insert into c_b1_t6 values(now+4s, 62)
 sql insert into c_b1_t6 values(now+5s, 61)

 sql show dnodes
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes

 #if $dnode1Vnodes != 1 then
@@ -496,10 +496,10 @@ print ============================== step14
 print ========= add dnode3

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -507,7 +507,7 @@ print dnode4 ==> $dnode4Role

 sleep 2000
 sql create dnode $hostname3
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 15000

 $x = 0
@@ -518,11 +518,11 @@ show14:
 	  return -1
 	endi
 sql show dnodes -x show14
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode1Vnodes != 2 then
@@ -536,9 +536,9 @@ if $dnode3Vnodes != 2 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -565,10 +565,10 @@ sql insert into c_b1_t8 values(now+4s, 82)
 sql insert into c_b1_t8 values(now+5s, 81)

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -578,7 +578,7 @@ print ========== add dnode4
 sleep 2000
 sql create dnode $hostname4
 print sql create dnode $hostname4 over
-system sh/exec.sh -n dnode4 -s start
+system sh/exec_up.sh -n dnode4 -s start
 print sleep 12000
 sleep 12000
 print sleep 12000 over
@@ -591,13 +591,13 @@ show15:
 	  return -1
 	endi
 sql show dnodes -x show15
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 2 then
@@ -627,7 +627,7 @@ sql insert into c_b1_t9 values(now+3s, 93)
 sql insert into c_b1_t9 values(now+4s, 92)
 sql insert into c_b1_t9 values(now+5s, 91)

-system sh/exec.sh -n dnode4 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop -x SIGINT

 $x = 0
 show16: 
@@ -637,11 +637,11 @@ show16:
 	  return -1
 	endi
 sql show dnodes -x show16
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode1Vnodes != 1 then
@@ -780,10 +780,10 @@ endi
 s8:

 print ============================================ over
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-system sh/exec.sh -n dnode3 -s stop -x SIGINT
-system sh/exec.sh -n dnode4 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop -x SIGINT



--- a/tests/script/unique/cluster/balance1_single.sim
+++ b/tests/script/unique/cluster/balance1_single.sim
@@ -31,11 +31,11 @@ system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4

 print ============== step1
 print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 3000
 sql connect
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start

 $x = 0
 show1: 
@@ -45,9 +45,9 @@ show1:
 	  return -1
 	endi
 sql show dnodes -x show1
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode2Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode3Vnodes

 if $dnode1Vnodes != 4 then
@@ -78,9 +78,9 @@ sql insert into c_b1_t2 values(now+4s, 22)
 sql insert into c_b1_t2 values(now+5s, 21)

 sql show dnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != 2 then
@@ -94,7 +94,7 @@ print ============================== step2
 print ========= start dnode3
 sleep 3000
 sql create dnode $hostname3
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 8000

 $x = 0
@@ -105,9 +105,9 @@ show2:
 	  return -1
 	endi
 sql show dnodes -x show2
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != 3 then
@@ -118,10 +118,10 @@ if $dnode3Vnodes != 3 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -152,9 +152,9 @@ show4:
 	  return -1
 	endi
 sql show dnodes -x show4
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != 1 then
@@ -165,10 +165,10 @@ if $dnode3Vnodes != null then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -176,9 +176,9 @@ print dnode4 ==> $dnode4Role

 print ============================== step5
 print ========= add dnode3
-system sh/exec.sh -n dnode3 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
 sleep 5000
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sql create dnode $hostname3
 sleep 9000

@@ -190,9 +190,9 @@ show5:
 	  return -1
 	endi
 sql show dnodes -x show5
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != 2 then
@@ -204,7 +204,7 @@ endi

 print ============================== step6
 print ========= drop dnode2
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 print stop dnode2 and sleep 10000
 sleep 10000

@@ -220,9 +220,9 @@ show6:
 	  return -1
 	endi
 sql show dnodes -x show6
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != null then
@@ -237,7 +237,7 @@ endi
 print ============================== step7
 print ========= add dnode2
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 9000

 $x = 0
@@ -248,9 +248,9 @@ show7:
 	  return -1
 	endi
 sql show dnodes -x show7
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != 3 then
@@ -262,7 +262,7 @@ endi

 print ============================== step8
 print ========= drop dnode3
-system sh/exec.sh -n dnode3 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
 print stop dnode3 and sleep 10000
 sleep 10000
 sql drop dnode $hostname3
@@ -277,9 +277,9 @@ show8:
 	  return -1
 	endi
 sql show dnodes -x show8
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != 1 then
@@ -292,7 +292,7 @@ endi
 print ============================== step9
 print ========= add dnode3
 sql create dnode $hostname3
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 9000

 $x = 0
@@ -303,9 +303,9 @@ show9:
 	  return -1
 	endi
 sql show dnodes -x show9
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != 2 then
@@ -334,9 +334,9 @@ show10:
 	  return -1
 	endi
 sql show dnodes -x show10
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != 2 then
@@ -365,9 +365,9 @@ show11:
 	  return -1
 	endi
 sql show dnodes -x show11
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode2Vnodes != 0 then
@@ -377,7 +377,7 @@ if $dnode3Vnodes != null then
   goto show11
 endi

-system sh/exec.sh -n dnode3 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop -x SIGINT

 print ============================== step12
 print ========= add db5
@@ -387,7 +387,7 @@ sql use c_b1_d5
 print ============================== step13
 print ========= add dnode3
 sql create dnode $hostname3
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 9000

 sql use c_b1_d5;
@@ -422,9 +422,9 @@ sql insert into c_b1_t6 values(now+4s, 62)
 sql insert into c_b1_t6 values(now+5s, 61)

 sql show dnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 #if $dnode2Vnodes != 1 then
@@ -437,7 +437,7 @@ print dnode3 $dnode3Vnodes
 print ============================== step14
 print ========= add dnode4
 sql create dnode $hostname4
-system sh/exec.sh -n dnode4 -s start
+system sh/exec_up.sh -n dnode4 -s start
 sleep 10000

 $x = 0
@@ -448,11 +448,11 @@ show14:
 	  return -1
 	endi
 sql show dnodes -x show14
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode2Vnodes != 2 then
@@ -490,7 +490,7 @@ sql insert into c_b1_t8 values(now+5s, 81)
 print ========== add dnode5
 sql create dnode $hostname5
 print sql create dnode $hostname5 over
-system sh/exec.sh -n dnode5 -s start
+system sh/exec_up.sh -n dnode5 -s start
 print sleep 12000
 sleep 12000
 print sleep 12000 over
@@ -503,13 +503,13 @@ show15:
 	  return -1
 	endi
 sql show dnodes -x show15
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
+$dnode5Vnodes = $data2_5
 print dnode5 $dnode5Vnodes

 if $dnode2Vnodes != 2 then
@@ -539,7 +539,7 @@ sql insert into c_b1_t9 values(now+3s, 93)
 sql insert into c_b1_t9 values(now+4s, 92)
 sql insert into c_b1_t9 values(now+5s, 91)

-system sh/exec.sh -n dnode5 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop -x SIGINT

 $x = 0
 show16: 
@@ -549,11 +549,11 @@ show16:
 	  return -1
 	endi
 sql show dnodes -x show16
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode2Vnodes != 1 then
@@ -707,10 +707,10 @@ endi


 print ============================================ over
-#system sh/exec.sh -n dnode2 -s stop -x SIGINT
-#system sh/exec.sh -n dnode3 -s stop -x SIGINT
-#system sh/exec.sh -n dnode4 -s stop -x SIGINT
-#system sh/exec.sh -n dnode5 -s stop -x SIGINT
+#system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
+#system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
+#system sh/exec_up.sh -n dnode4 -s stop -x SIGINT
+#system sh/exec_up.sh -n dnode5 -s stop -x SIGINT



--- a/tests/script/unique/cluster/balance2.sim
+++ b/tests/script/unique/cluster/balance2.sim
@@ -46,14 +46,14 @@ system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 0

 print ============== step1
 print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start

 sql connect
 sleep 4001
 sql create dnode $hostname2
 sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 4001

 sql create database c_b2_d1 replica 2 tables 4
@@ -91,11 +91,11 @@ show1:
 	  return -1
 	endi
 sql show dnodes -x show1
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode1Vnodes != 2 then
@@ -121,11 +121,11 @@ show2:
 	  return -1
 	endi
 sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode1Vnodes != 1 then
@@ -139,16 +139,16 @@ if $dnode3Vnodes != 1 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role

-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT

 print ============================== step3
 print ========= start dnode2
@@ -162,7 +162,7 @@ system sh/cfg.sh -n dnode2 -c clog -v 1
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
 sleep 3000

-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 10000

 $x = 0
@@ -173,11 +173,11 @@ show3:
 	  return -1
 	endi
 sql show dnodes -x show3
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode1Vnodes != 2 then
@@ -191,10 +191,10 @@ if $dnode3Vnodes != 2 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -213,11 +213,11 @@ show4:
 	  return -1
 	endi
 sql show dnodes -x show4
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode1Vnodes != 1 then
@@ -231,16 +231,16 @@ if $dnode3Vnodes != null then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role

-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT

 print ============================== step5
 print ========= start dnode3
@@ -254,7 +254,7 @@ system sh/cfg.sh -n dnode3 -c clog -v 1
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 0
 sleep 3000

-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 9000

 $x = 0
@@ -265,11 +265,11 @@ show5:
 	  return -1
 	endi
 sql show dnodes -x show5
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode1Vnodes != 2 then
@@ -283,10 +283,10 @@ if $dnode3Vnodes != 2 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -294,7 +294,7 @@ print dnode4 ==> $dnode4Role

 print ============================== step6
 print ========= drop dnode1
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
 print stop dnode1 and sleep 10000
 sleep 10000

@@ -310,11 +310,11 @@ show6:
 	  return -1
 	endi
 sql show dnodes -x show6
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode1Vnodes != null then
@@ -328,10 +328,10 @@ if $dnode3Vnodes != 1 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -342,10 +342,10 @@ print ========= start dnode1
 sql create dnode $hostname1

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -359,17 +359,17 @@ system sh/cfg.sh -n dnode1 -c clog -v 1
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 sleep 3000

-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 9000

 $x = 0

 show7: 
 	sql show mnodes
-	$dnode1Role = $data3_192.168.0.1
-	$dnode2Role = $data3_192.168.0.2
-	$dnode3Role = $data3_192.168.0.3
-	$dnode4Role = $data3_192.168.0.4
+	$dnode1Role = $data2_1
+	$dnode2Role = $data2_2
+	$dnode3Role = $data2_3
+	$dnode4Role = $data2_4
 	print dnode1 ==> $dnode1Role
 	print dnode2 ==> $dnode2Role
 	print dnode3 ==> $dnode3Role
@@ -381,11 +381,11 @@ show7:
 	  return -1
 	endi
 sql show dnodes -x show7
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes

 if $dnode1Vnodes != 2 then
@@ -411,14 +411,14 @@ sql insert into c_b2_t4 values(1520000023042, 42)
 sql insert into c_b2_t4 values(1520000024041, 41)

 sql create dnode $hostname4
-system sh/exec.sh -n dnode4 -s start
+system sh/exec_up.sh -n dnode4 -s start
 sleep 9000

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -432,13 +432,13 @@ show8:
 	  return -1
 	endi
 sql show dnodes -x show8
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 2 then
@@ -461,10 +461,10 @@ sql drop dnode $hostname4
 sleep 10000

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -478,13 +478,13 @@ show9:
 	  return -1
 	endi
 sql show dnodes -x show9
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != null then
@@ -500,8 +500,8 @@ if $dnode4Vnodes != null then
  goto show9
 endi

-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT

 print ============================== step10
 print ========= start dnode1.4
@@ -524,17 +524,17 @@ system sh/cfg.sh -n dnode4 -c clog -v 1
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0
 sleep 3000

-system sh/exec.sh -n dnode1 -s start
-system sh/exec.sh -n dnode4 -s start
+system sh/exec_up.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode4 -s start
 sleep 10000

 $x = 0
 show10: 
 	sql show mnodes
-	$dnode1Role = $data3_192.168.0.1
-	$dnode2Role = $data3_192.168.0.2
-	$dnode3Role = $data3_192.168.0.3
-	$dnode4Role = $data3_192.168.0.4
+	$dnode1Role = $data2_1
+	$dnode2Role = $data2_2
+	$dnode3Role = $data2_3
+	$dnode4Role = $data2_4
 	print dnode1 ==> $dnode1Role
 	print dnode2 ==> $dnode2Role
 	print dnode3 ==> $dnode3Role
@@ -546,13 +546,13 @@ show10:
 	  return -1
 	endi
 sql show dnodes -x show10
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 2 then
@@ -571,10 +571,10 @@ endi
 print ============================== step11

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -606,13 +606,13 @@ show11:
 	  return -1
 	endi
 sql show dnodes -x show11
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 1 then
@@ -629,10 +629,10 @@ if $dnode4Vnodes != 1 then
 endi

 sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -758,13 +758,13 @@ endi


 print ============================================ over
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT


--- a/tests/script/unique/cluster/balance3.sim
+++ b/tests/script/unique/cluster/balance3.sim
@@ -56,14 +56,14 @@ system sh/cfg.sh -n dnode8 -c clog -v 1

 print ============== step1
 print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sleep 2001

 sql create dnode $hostname2
 sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 3001

 sql create database c_b3_d1 replica 3
@@ -101,13 +101,13 @@ show1:
 	  return -1
 	endi
 sql show dnodes -x show1
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 1 then
@@ -126,7 +126,7 @@ endi
 print ============================== step2
 print ========= start dnode4
 sql create dnode $hostname4
-system sh/exec.sh -n dnode4 -s start
+system sh/exec_up.sh -n dnode4 -s start
 sleep 9000

 $x = 0
@@ -137,13 +137,13 @@ show2:
 	  return -1
 	endi
 sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode4Vnodes != 2 then
@@ -163,13 +163,13 @@ show3:
 	  return -1
 	endi
 sql show dnodes -x show3
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 1 then
@@ -185,7 +185,7 @@ if $dnode4Vnodes != 1 then
  goto show3
 endi

-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT

 print ============================== step4
 print ========= start dnode2
@@ -197,7 +197,7 @@ system sh/cfg.sh -n dnode2 -c clog -v 1
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 0
 sleep 3000
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 10000

 $x = 0
@@ -208,13 +208,13 @@ show4:
 	  return -1
 	endi
 sql show dnodes -x show4
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode2Vnodes != 2 then
@@ -234,13 +234,13 @@ show5:
 	  return -1
 	endi
 sql show dnodes -x show5
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 1 then
@@ -257,7 +257,7 @@ if $dnode4Vnodes != 1 then
 endi


-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT

 print ============================== step6
 print ========= start dnode3
@@ -269,7 +269,7 @@ system sh/cfg.sh -n dnode3 -c clog -v 1
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 0
 sleep 3000
 sql create dnode $hostname3
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 9000

 $x = 0
@@ -280,13 +280,13 @@ show6:
 	  return -1
 	endi
 sql show dnodes -x show6
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode3Vnodes != 2 then
@@ -306,13 +306,13 @@ show7:
 	  return -1
 	endi
 sql show dnodes -x show7
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 1 then
@@ -328,7 +328,7 @@ if $dnode4Vnodes != null then
  goto show7
 endi

-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT

 print ============================== step8
 print ========= start dnode4
@@ -340,7 +340,7 @@ system sh/cfg.sh -n dnode4 -c clog -v 1
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 0
 sleep 3000
 sql create dnode $hostname4
-system sh/exec.sh -n dnode4 -s start
+system sh/exec_up.sh -n dnode4 -s start
 sleep 9000

 $x = 0
@@ -351,13 +351,13 @@ show8:
 	  return -1
 	endi
 sql show dnodes -x show8
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode4Vnodes != 2 then
@@ -366,7 +366,7 @@ endi

 print ============================== step9
 print ========= drop dnode1
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
 print stop dnode1 and sleep 10000
 sleep 10000

@@ -382,13 +382,13 @@ show9:
 	  return -1
 	endi
 sql show dnodes -x show9
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != null then
@@ -414,7 +414,7 @@ system sh/cfg.sh -n dnode1 -c clog -v 1
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 sleep 3000
 sql create dnode $hostname1
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 9000

 $x = 0
@@ -425,13 +425,13 @@ show10:
 	  return -1
 	endi
 sql show dnodes -x show10
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 2 then
@@ -466,13 +466,13 @@ show11:
 	  return -1
 	endi
 sql show dnodes -x show11
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != 1 then
@@ -501,13 +501,13 @@ show12:
 	  return -1
 	endi
 sql show dnodes -x show12
-$dnode1Vnodes = $data3_192.168.0.1
+$dnode1Vnodes = $data2_1
 print dnode1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
+$dnode2Vnodes = $data2_2
 print dnode2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
+$dnode3Vnodes = $data2_3
 print dnode3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
+$dnode4Vnodes = $data2_4
 print dnode4 $dnode4Vnodes

 if $dnode1Vnodes != null then
@@ -523,7 +523,7 @@ if $dnode4Vnodes != 0 then
  goto show12
 endi

-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT

 print ============================== step13
 print ========= check data
@@ -607,13 +607,13 @@ endi


 print ============================================ over
-system sh/exec.sh -n dnode1 -s stop  -x SIGINT
-system sh/exec.sh -n dnode2 -s stop  -x SIGINT
-system sh/exec.sh -n dnode3 -s stop  -x SIGINT
-system sh/exec.sh -n dnode4 -s stop  -x SIGINT
-system sh/exec.sh -n dnode5 -s stop  -x SIGINT
-system sh/exec.sh -n dnode6 -s stop  -x SIGINT
-system sh/exec.sh -n dnode7 -s stop  -x SIGINT
-system sh/exec.sh -n dnode8 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode3 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode4 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode5 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode6 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode7 -s stop  -x SIGINT
+system sh/exec_up.sh -n dnode8 -s stop  -x SIGINT


--- a/tests/script/unique/cluster/testSuite.sim
+++ b/tests/script/unique/cluster/testSuite.sim
-#run unique/unique/balance1.sim
-#run unique/unique/balance2.sim
-#run unique/unique/balance3.sim
-#run unique/unique/balance1_bug.sim
-#run unique/unique/balance1_single.sim
\ No newline at end of file
+run unique/cluster/balance1.sim
+run unique/cluster/balance2.sim
+run unique/cluster/balance3.sim
+run unique/cluster/balance1_bug.sim
+run unique/cluster/balance1_single.sim
\ No newline at end of file
--- a/tests/script/unique/column/testSuite.sim
+++ b/tests/script/unique/column/testSuite.sim
-#run unique/column/replica3.sim
+run unique/column/replica3.sim
--- a/tests/script/unique/http/admin.sim
+++ b/tests/script/unique/http/admin.sim
 system sh/stop_dnodes.sh

-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c http -v 1
+system sh/cfg.sh -n dnode1 -c clog -v 0
 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start

 sql connect
 sleep 3000
@@ -31,49 +31,49 @@ sql insert into table_admin values('2017-12-25 21:28:50.022', 10)

 print ===============  step1 - login

-system_content curl 192.168.0.1:6020/admin/
+system_content curl 127.0.0.1:6020/admin/
 print 1-> $system_content
 if $system_content != @{"status":"error","code":1011,"desc":"no auth info input"}@ then
  return -1
 endi

-system_content curl 192.168.0.1:6020/admin/xx
+system_content curl 127.0.0.1:6020/admin/xx
 print 2-> $system_content
 if $system_content != @{"status":"error","code":1011,"desc":"no auth info input"}@ then
  return -1
 endi

-system_content curl 192.168.0.1:6020/admin/login
+system_content curl 127.0.0.1:6020/admin/login
 print 3-> $system_content
 if $system_content != @{"status":"error","code":1011,"desc":"no auth info input"}@ then
  return -1
 endi

-system_content curl 192.168.0.1:6020/admin/login/root
+system_content curl 127.0.0.1:6020/admin/login/root
 print 4-> $system_content
 if $system_content != @{"status":"error","code":1011,"desc":"no auth info input"}@ then
  return -1
 endi

-system_content curl 192.168.0.1:6020/admin/login/root/123
+system_content curl 127.0.0.1:6020/admin/login/root/123
 print 5-> $system_content
-if $system_content != @{"status":"error","code":10,"desc":"authentication failure"}@ then
+if $system_content != @{"status":"error","code":1000,"desc":"auth failure"}@ then
  return -1
 endi

-system_content curl 192.168.0.1:6020/admin/login/root/123/1/1/3
+system_content curl 127.0.0.1:6020/admin/login/root/123/1/1/3
 print 6-> $system_content
-if $system_content != @{"status":"error","code":10,"desc":"authentication failure"}@ then
+if $system_content != @{"status":"error","code":1000,"desc":"auth failure"}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.'  -d 'show databases' 192.168.0.1:6020/admin/login/root/1
+system_content curl -H 'Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.'  -d 'show databases' 127.0.0.1:6020/admin/login/root/1
 print 7-> $system_content
 if $system_content != @{"status":"error","code":1010,"desc":"invalid type of Authorization"}@ then
  return -1
 endi

-system_content curl -H 'Authorization: Taosd eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi' 192.168.0.1:6020/admin/login/root/1
+system_content curl -H 'Authorization: Taosd eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJ3d3cudGFvc2RhdGEuY29tIiwicGFzcyI6InRhb3NkYXRhIiwic3ViIjoicm9vdCJ9.xPv3b5odlR7YF8G_QWASjIRbMtA5v4ItToJ35fFgi' 127.0.0.1:6020/admin/login/root/1
 print 8-> $system_content
 if $system_content != @{"status":"error","code":1053,"desc":"parse http auth token error"}@ then
  return -1
@@ -87,7 +87,7 @@ if $system_content != {"status":"succ","code":0,"desc":"/KfeAzX/f9na8qdtNZmtONry
  return -1
 endi

-#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 192.168.0.1:6020/admin/login/root/1
+#system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show databases' 127.0.0.1:6020/admin/login/root/1
 #print 10-> $system_content
 #if $system_content != @{"status":"error","code":29,"desc":"failed to connect to server"}@ then
 #  return -1
@@ -121,9 +121,9 @@ print ===============  step4 - meta

 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d 'show mnodes' 127.0.0.1:6020/admin/meta
 print curl 127.0.0.1:6020/admin/meta -----> $system_content
-if $system_content != @{"status":"succ","head":["column type","column name","column bytes"],"data":[["binary","IP",16],["timestamp","created time",8],["binary","status",10],["binary","role",10],["binary","public ip",16]],"rows":5}@ then
-  return -1
-endi
+#if $system_content != @{"status":"succ","head":["column type","column name","column bytes"],"data":[["binary","IP",16],["timestamp","created time",8],["binary","status",10],["binary","role",10],["binary","public ip",16]],"rows":5}@ then
+#  return -1
+#endi

 print ===============  step5 - query data

@@ -175,6 +175,6 @@ endi
 print ===============  step8 - monitor dbs
 #system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'show dnodes;show mnodes;' 127.0.0.1:6020/admin/sqls
 #print 24-> $system_content
-#if $system_content != @[{"status":"succ","head":["IP","created time","open vnodes","free vnodes","status","balance state"],"data":[["192.168.0.1","2018-09-04 #11:16:13.985",1,3,"ready","balanced"]],"rows":1},{"status":"succ","head":["IP","created time","status","role"],"data":[["192.168.0.1","2018-09-04 11:16:13.371","serving","master"]],"rows":1}]@ then
+#if $system_content != @[{"status":"succ","head":["IP","created time","open vnodes","free vnodes","status","balance state"],"data":[["127.0.0.1","2018-09-04 #11:16:13.985",1,3,"ready","balanced"]],"rows":1},{"status":"succ","head":["IP","created time","status","role"],"data":[["127.0.0.1","2018-09-04 11:16:13.371","serving","master"]],"rows":1}]@ then
 #  return -1
 #	endi
\ No newline at end of file
--- a/tests/script/unique/http/opentsdb.sim
+++ b/tests/script/unique/http/opentsdb.sim
 system sh/stop_dnodes.sh

-
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/exec.sh -n dnode1 -s start
+system sh/cfg.sh -n dnode1 -c clog -v 0
+system sh/exec_up.sh -n dnode1 -s start

 sleep 3000
 sql connect

--- a/tests/script/unique/import/replica2.sim
+++ b/tests/script/unique/import/replica2.sim
 system sh/stop_dnodes.sh

-
-
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
@@ -31,12 +26,12 @@ system sh/cfg.sh -n dnode3 -c commitlog -v 0
 system sh/cfg.sh -n dnode4 -c commitlog -v 0

 print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 3000
 sql connect

 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start

 sql create database ir2db replica 2 days 7
 sql use ir2db
@@ -95,9 +90,9 @@ if $rows != 11 then
 endi

 print ================== dnode restart
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 sleep 5000
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 5000
 sql select * from tb;
 if $rows != 11 then 
@@ -158,9 +153,9 @@ if $rows != 29 then
 endi

 print ================= step10
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 sleep 5000
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 5000
 sql select * from tb;
 if $rows != 29 then 
@@ -186,7 +181,7 @@ if $rows != 43 then
 endi

 print ================= step13
-system sh/exec.sh -n dnode2 -s stop 
+system sh/exec_up.sh -n dnode2 -s stop 
 sleep 5000

 print ================= step14
@@ -205,9 +200,9 @@ if $rows != 46 then
 endi

 print ================= step15
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 8000
-system sh/exec.sh -n dnode1 -s stop
+system sh/exec_up.sh -n dnode1 -s stop
 sleep 10000

 if $rows != 46 then 

--- a/tests/script/unique/import/replica3.sim
+++ b/tests/script/unique/import/replica3.sim
 system sh/stop_dnodes.sh

-
-
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
@@ -31,14 +26,14 @@ system sh/cfg.sh -n dnode3 -c commitlog -v 0
 system sh/cfg.sh -n dnode4 -c commitlog -v 0

 print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 5000
 sql connect

 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sql create dnode $hostname3
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start


 sql create database ir3db replica 3 days 7
@@ -97,9 +92,9 @@ if $rows != 11 then
 endi

 #print ================== dnode restart
-#system sh/exec.sh -n dnode1 -s stop -x SIGINT
+#system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 #sleep 5000
-#system sh/exec.sh -n dnode1 -s start
+#system sh/exec_up.sh -n dnode1 -s start
 #sleep 5000
 #sql select * from tb;
 #if $rows != 11 then 
@@ -146,9 +141,9 @@ if $rows != 29 then
 endi

 print ================= step10
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 sleep 5000
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 5000
 sql select * from tb;
 if $rows != 29 then 
@@ -170,7 +165,7 @@ if $rows != 43 then
 endi

 print ================= step13
-system sh/exec.sh -n dnode2 -s stop 
+system sh/exec_up.sh -n dnode2 -s stop 
 sleep 5000

 print ================= step14
@@ -183,9 +178,9 @@ if $rows != 46 then
 endi

 print ================= step15
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 8000
-system sh/exec.sh -n dnode3 -s stop
+system sh/exec_up.sh -n dnode3 -s stop
 sleep 3000

 if $rows != 46 then 

--- a/tests/script/unique/import/testSuite.sim
+++ b/tests/script/unique/import/testSuite.sim
-run unique/import/replica2.sim
-run unique/import/replica3.sim
\ No newline at end of file
+#run unique/import/replica2.sim
+#run unique/import/replica3.sim
\ No newline at end of file
--- a/tests/script/unique/table/testSuite.sim
+++ b/tests/script/unique/table/testSuite.sim
-run unique/table/delete_part.sim
+#run unique/table/delete_part.sim
--- a/tests/script/unique/vnode/commit.sim
+++ b/tests/script/unique/vnode/commit.sim
 system sh/stop_dnodes.sh

-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c clog -v 2
+system sh/cfg.sh -n dnode2 -c clog -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start

 sql connect
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 3000

 print =================== step 1 create db
@@ -22,7 +21,7 @@ sql insert into tb values(now, 0)

 print =================== step2 sleep 2000 and kill dnode2(SIGINT)
 sleep 2000
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 sleep 1000

 print =================== step3 insert into dnode1
@@ -99,13 +98,13 @@ if $rows != 936 then
 endi

 print =================== step5 sleep kill dnode1(SIGINT) then start dnode1
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 sleep 5000
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start

 sleep 3000
 print =================== step6 start dnode2 and sleep 10000 (wait sync complete)
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 12000

 print =================== step7
@@ -128,7 +127,7 @@ if $rows != $remainRows then
 endi

 print =================== step8 kill dnode1(SIGINT) and query
-system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec_up.sh -n dnode1 -s stop -x SIGINT
 sleep 2000

 print =================== step9
@@ -149,4 +148,4 @@ if $rows != $remainRows then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
--- a/tests/script/unique/vnode/many.sim
+++ b/tests/script/unique/vnode/many.sim
 system sh/stop_dnodes.sh

-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
-system sh/cfg.sh -n dnode4 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c clog -v 2
+system sh/cfg.sh -n dnode2 -c clog -v 2
+system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode4 -c clog -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1
@@ -23,13 +20,13 @@ system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start

 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 3000

 print ========= step1
@@ -60,22 +57,22 @@ run_back cluster/vnode/back_insert_many.sim
 sleep 5000

 print ======== step3
-system sh/exec.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
 sleep 10000

 $x = 0
 loop:

 print ======== step4
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 10000
-system sh/exec.sh -n dnode3 -s stop
+system sh/exec_up.sh -n dnode3 -s stop
 sleep 10000

 print ======== step5
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 10000
-system sh/exec.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
 sleep 10000

 print ======== step6

--- a/tests/script/unique/vnode/replica2_basic.sim
+++ b/tests/script/unique/vnode/replica2_basic.sim
@@ -2,15 +2,15 @@ system sh/stop_dnodes.sh

 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c clog -v 2
+system sh/cfg.sh -n dnode2 -c clog -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start

 sql connect
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 3000

 $N = 10
@@ -50,7 +50,7 @@ if $rows != $expect then
 endi

 print =================== step 4
-system sh/exec.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
 sleep 2000
 $y = $x + $N
 $expect = $N * 2
@@ -67,7 +67,7 @@ if $rows != $expect then
 endi

 print =================== step 5
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 2000
 $y = $x + $N
 $expect = $N * 3
@@ -84,7 +84,7 @@ if $rows != $expect then
 endi

 print =================== step 6
-system sh/exec.sh -n dnode1 -s stop
+system sh/exec_up.sh -n dnode1 -s stop
 sleep 2000
 $y = $x + $N
 $expect = $N * 4
@@ -101,7 +101,7 @@ return -1
 endi

 print =================== step 7
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 2000
 $y = $x + $N
 $expect = $N * 5
@@ -188,5 +188,5 @@ if $rows != $expect then
 endi

 print =================== step 12
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode1 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
--- a/tests/script/unique/vnode/replica2_basic2.sim
+++ b/tests/script/unique/vnode/replica2_basic2.sim
 system sh/stop_dnodes.sh

-
-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4

-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
-system sh/cfg.sh -n dnode4 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c clog -v 2
+system sh/cfg.sh -n dnode2 -c clog -v 2
+system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode4 -c clog -v 2

 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -30,12 +26,12 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4

 print ========= start dnodes
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sql create dnode $hostname2
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sql create dnode $hostname3
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 3000

 sql reset query cache
@@ -77,23 +73,19 @@ if $rows != 1 then
 endi

 sql show dnodes
-print dnode1 ==> openVnodes: $data2_192.168.0.1  freeVnodes: $data3_192.168.0.1
-print dnode2 ==> openVnodes: $data2_192.168.0.2  freeVnodes: $data3_192.168.0.2
-print dnode3 ==> openVnodes: $data2_192.168.0.3  freeVnodes: $data3_192.168.0.3
+print dnode1 ==> openVnodes: $data2_1
+print dnode2 ==> openVnodes: $data2_2
+print dnode3 ==> openVnodes: $data2_3

-if $data2_192.168.0.1 != 0 then
- return -1
-endi
-
-if $data3_192.168.0.1 != 4 then
+if $data2_1 != 0 then
  return -1
 endi

-if $data3_192.168.0.2 != 0 then
+if $data2_2 != 4 then
  return -1
 endi

-if $data3_192.168.0.3 != 0 then
+if $data2_3 != 4 then
  return -1
 endi

@@ -124,70 +116,68 @@ if $rows != 2 then
 endi

 print ========= step3 
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 3000
+system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
+sleep 5000

-sql insert into d1.t1 values(now, 3)
-sql insert into d2.t2 values(now, 3)
-sql insert into d3.t3 values(now, 3)
-sql insert into d4.t4 values(now, 3)
+#sql insert into d1.t1 values(now, 3)
+#sql insert into d2.t2 values(now, 3)
+#sql insert into d3.t3 values(now, 3)
+#sql insert into d4.t4 values(now, 3)

 sql select * from d1.t1
-if $rows != 3 then
+if $rows != 2 then
 	return -1
 endi

 sql select * from d2.t2
-if $rows != 3 then
+if $rows != 2 then
 	return -1
 endi

 sql select * from d3.t3
-if $rows != 3 then
+if $rows != 2 then
 	return -1
 endi

 sql select * from d4.t4
-if $rows != 3 then
+if $rows != 2 then
 	return -1
 endi

 print ========= step4
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
+sleep 5000
+system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
 sleep 5000
-system sh/exec.sh -n dnode3 -s stop -x SIGINT
-sleep 3000

-sql insert into d1.t1 values(now, 4)
-sql insert into d2.t2 values(now, 4)
-sql insert into d3.t3 values(now, 4)
-sql insert into d4.t4 values(now, 4)
+#sql insert into d1.t1 values(now, 4)
+#sql insert into d2.t2 values(now, 4)
+#sql insert into d3.t3 values(now, 4)
+#sql insert into d4.t4 values(now, 4)

 sql select * from d1.t1
-if $rows != 4 then
+if $rows != 2 then
 	return -1
 endi

 sql select * from d2.t2
-if $rows != 4 then
+if $rows != 2 then
 	return -1
 endi

 sql select * from d3.t3
-if $rows != 4 then
+if $rows != 2 then
 	return -1
 endi

 sql select * from d4.t4
-if $rows != 4 then
+if $rows != 2 then
 	return -1
 endi

 print ========= step5
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 5000
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 3000

 sql insert into d1.t1 values(now, 5)
 sql insert into d2.t2 values(now, 5)
@@ -195,21 +185,21 @@ sql insert into d3.t3 values(now, 5)
 sql insert into d4.t4 values(now, 5)

 sql select * from d1.t1
-if $rows != 5 then
+if $rows != 3 then
 	return -1
 endi

 sql select * from d2.t2
-if $rows != 5 then
+if $rows != 3 then
 	return -1
 endi

 sql select * from d3.t3
-if $rows != 5 then
+if $rows != 3 then
 	return -1
 endi

 sql select * from d4.t4
-if $rows != 5 then
+if $rows != 3 then
 	return -1
 endi
\ No newline at end of file
--- a/tests/script/unique/vnode/replica2_repeat.sim
+++ b/tests/script/unique/vnode/replica2_repeat.sim
 system sh/stop_dnodes.sh

-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
-system sh/cfg.sh -n dnode4 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c clog -v 2
+system sh/cfg.sh -n dnode2 -c clog -v 2
+system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode4 -c clog -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1
@@ -19,13 +16,13 @@ system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start

 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 3000

 print ========= step1
@@ -40,22 +37,22 @@ run_back cluster/vnode/back_insert.sim
 sleep 3000

 print ======== step3
-system sh/exec.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
 sleep 5000

 $x = 0
 loop:

 print ======== step4
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 5000
-system sh/exec.sh -n dnode3 -s stop
+system sh/exec_up.sh -n dnode3 -s stop
 sleep 5000

 print ======== step5
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 5000
-system sh/exec.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
 sleep 5000

 print ======== step6

--- a/tests/script/unique/vnode/replica3_basic.sim
+++ b/tests/script/unique/vnode/replica3_basic.sim
 system sh/stop_dnodes.sh

-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c clog -v 2
+system sh/cfg.sh -n dnode2 -c clog -v 2
+system sh/cfg.sh -n dnode3 -c clog -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3

-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 3000

 $N = 10
@@ -50,7 +48,7 @@ if $rows != $expect then
 endi

 print =================== step 3
-system sh/exec.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
 sleep 2000
 $y = $x + $N
 $expect = $N * 2
@@ -67,7 +65,7 @@ if $rows != $expect then
 endi

 print =================== step 4
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 2000
 $y = $x + $N
 $expect = $N * 3
@@ -84,7 +82,7 @@ if $rows != $expect then
 endi

 print =================== step 5
-system sh/exec.sh -n dnode3 -s stop
+system sh/exec_up.sh -n dnode3 -s stop
 sleep 2000
 $y = $x + $N
 $expect = $N * 4
@@ -101,7 +99,7 @@ if $rows != $expect then
 endi

 print =================== step 6
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 2000
 $y = $x + $N
 $expect = $N * 5
@@ -118,7 +116,7 @@ return -1
 endi

 print =================== step 7
-system sh/exec.sh -n dnode1 -s stop
+system sh/exec_up.sh -n dnode1 -s stop
 sleep 2000
 $y = $x + $N
 $expect = $N * 6
@@ -135,7 +133,7 @@ return -1
 endi

 print =================== step 8
-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sleep 2000
 $y = $x + $N
 $expect = $N * 7
@@ -151,8 +149,8 @@ if $rows != $expect then
  return -1
 endi

-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
+system sh/exec_up.sh -n dnode1 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode3 -s stop


--- a/tests/script/unique/vnode/replica3_repeat.sim
+++ b/tests/script/unique/vnode/replica3_repeat.sim
 system sh/stop_dnodes.sh

-
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
 system sh/deploy.sh -n dnode4 -i 4
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
-system sh/cfg.sh -n dnode4 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c clog -v 2
+system sh/cfg.sh -n dnode2 -c clog -v 2
+system sh/cfg.sh -n dnode3 -c clog -v 2
+system sh/cfg.sh -n dnode4 -c clog -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 1
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 1
@@ -20,15 +17,15 @@ system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
 system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4

-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start

 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
 sql create dnode $hostname4
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-system sh/exec.sh -n dnode4 -s start
+system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode4 -s start
 sleep 3000

 print ========= step1
@@ -43,28 +40,28 @@ run_back cluster/vnode/back_insert.sim
 sleep 3000

 print ======== step3
-system sh/exec.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
 sleep 5000

 $x = 0
 loop:

 print ======== step4
-system sh/exec.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode2 -s start
 sleep 5000
-system sh/exec.sh -n dnode3 -s stop
+system sh/exec_up.sh -n dnode3 -s stop
 sleep 5000

 print ======== step5
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 5000
-system sh/exec.sh -n dnode4 -s stop
+system sh/exec_up.sh -n dnode4 -s stop
 sleep 5000

 print ======== step6
-system sh/exec.sh -n dnode4 -s start
+system sh/exec_up.sh -n dnode4 -s start
 sleep 5000
-system sh/exec.sh -n dnode2 -s stop
+system sh/exec_up.sh -n dnode2 -s stop
 sleep 5000

 print ======== step7

--- a/tests/script/unique/vnode/replica3_vgroup.sim
+++ b/tests/script/unique/vnode/replica3_vgroup.sim
 system sh/stop_dnodes.sh

-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/deploy.sh -n dnode2 -i 2
 system sh/deploy.sh -n dnode3 -i 3
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
+system sh/cfg.sh -n dnode1 -c clog -v 2
+system sh/cfg.sh -n dnode2 -c clog -v 2
+system sh/cfg.sh -n dnode3 -c clog -v 2
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/cfg.sh -n dnode3 -c numofMpeers -v 3

-system sh/exec.sh -n dnode1 -s start
+system sh/exec_up.sh -n dnode1 -s start
 sql connect
 sql create dnode $hostname2
 sql create dnode $hostname3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
+system sh/exec_up.sh -n dnode2 -s start
+system sh/exec_up.sh -n dnode3 -s start
 sleep 3000

 $N = 10

--- a/tests/script/unique/vnode/testSuite.sim
+++ b/tests/script/unique/vnode/testSuite.sim
 run unique/vnode/replica2_basic2.sim
-run unique/vnode/replica2_basic.sim
-run unique/vnode/replica2_repeat.sim
+#run unique/vnode/replica2_basic.sim
+#run unique/vnode/replica2_repeat.sim
 run unique/vnode/replica3_basic.sim
-run unique/vnode/replica3_repeat.sim
-run unique/vnode/commit.sim
-run unique/vnode/many.sim
-
-
+#run unique/vnode/replica3_repeat.sim
+#run unique/vnode/commit.sim
+#run unique/vnode/many.sim
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -7,23 +7,28 @@ GREEN_DARK='\033[0;32m'
 GREEN_UNDERLINE='\033[4;32m'
 NC='\033[0m'

+echo "### run TSIM script ###"
 cd script
-./test.sh -f basicSuite.sim 2>&1 | grep 'success\|failed\|fault' | tee out.txt
+./test.sh -f basicSuite.sim 2>&1 | grep 'success\|failed\|fault' | grep -v 'default' | tee out.txt

-totalSuccess=`grep -w 'success' out.txt | wc -l`
+totalSuccess=`grep 'success' out.txt | wc -l`
 totalBasic=`grep success out.txt | grep Suite | wc -l`

 if [ "$totalSuccess" -gt "0" ]; then
  totalSuccess=`expr $totalSuccess - $totalBasic`
-  echo -e "${GREEN} ### Total $totalSuccess TSIM case(s) succeed! ### ${NC}"
 fi

-totalFailed=`grep -w 'failed\|fault' out.txt | wc -l`
+echo -e "${GREEN} ### Total $totalSuccess TSIM case(s) succeed! ### ${NC}"
+
+totalFailed=`grep 'failed\|fault' out.txt | wc -l`
+echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}"
+
 if [ "$totalFailed" -ne "0" ]; then
-  echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}"
+#  echo -e "${RED} ### Total $totalFailed TSIM case(s) failed! ### ${NC}"
  exit $totalFailed
 fi

+echo "### run Python script ###"
 cd ../pytest

 if [ "$1" == "cron" ]; then

--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -735,6 +735,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
              break;
            case TSDB_DATA_TYPE_BINARY:
            case TSDB_DATA_TYPE_NCHAR:
+              memset(value, 0, MAX_QUERY_VALUE_LEN);
              memcpy(value, row[i], length[i]);
              value[length[i]] = 0;
              // snprintf(value, fields[i].bytes, "%s", (char *)row[i]);