Merge branch 'develop' into hotfix/fix-issues-scanned-by-tsc

src/client/src/tscServer.c

@@ -86,8 +86,11 @@ void tscSetMgmtIpListFromEdge() {
 }
 
 void tscUpdateIpSet(void *ahandle, SRpcIpSet *pIpSet) {
-  tscTrace("mgmt IP list is changed for ufp is called");
   tscMgmtIpSet = *pIpSet;
+  tscTrace("mgmt IP list is changed for ufp is called, numOfIps:%d inUse:%d", tscMgmtIpSet.numOfIps, tscMgmtIpSet.inUse);
+  for (int32_t i = 0; i < tscMgmtIpSet.numOfIps; ++i) {
+    tscTrace("index:%d fqdn:%s port:%d", i, tscMgmtIpSet.fqdn[i], tscMgmtIpSet.port[i]);
+  }
 }
 
 void tscSetMgmtIpList(SRpcIpSet *pIpList) {
@@ -138,7 +141,7 @@ void tscProcessHeartBeatRsp(void *param, TAOS_RES *tres, int code) {
       if (pRsp->streamId) tscKillStream(pObj, htonl(pRsp->streamId));
     }
   } else {
-    tscTrace("heart beat failed, code:%d", code);
+    tscTrace("heart beat failed, code:%s", tstrerror(code));
   }
 
   taosTmrReset(tscProcessActivityTimer, tsShellActivityTimer * 500, pObj, tscTmr, &pObj->pTimer);

src/common/inc/tulog.h

@@ -43,6 +43,8 @@ extern int32_t tscEmbedded;
   }
 #define uPrint(...) \
   { taosPrintLog("UTL ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
+#define uForcePrint(...) \
+  { taosPrintLog("ERROR UTL ", 255, __VA_ARGS__); }
 
 #define pError(...) \
   { taosPrintLog("ERROR APP ", 255, __VA_ARGS__); }  

src/common/src/tlocale.c

@@ -27,27 +27,20 @@
  * In case that the setLocale failed to be executed, the right charset needs to be set.
  */
 void tsSetLocale() {
-  char msgLocale[] = "Invalid locale:%s, please set the valid locale in config file\n";
-  char msgCharset[] = "Invalid charset:%s, please set the valid charset in config file\n";
-  char msgCharset1[] = "failed to get charset, please set the valid charset in config file\n";
-
   char *locale = setlocale(LC_CTYPE, tsLocale);
 
   // default locale or user specified locale is not valid, abort launch
   if (locale == NULL) {
-    printf(msgLocale, tsLocale);
-    uPrint(msgLocale, tsLocale);
+    uForcePrint("Invalid locale:%s, please set the valid locale in config file", tsLocale);
   }
 
   if (strlen(tsCharset) == 0) {
-    printf("%s\n", msgCharset1);
-    uPrint(msgCharset1);
+    uForcePrint("failed to get charset, please set the valid charset in config file");
     exit(-1);
   }
 
   if (!taosValidateEncodec(tsCharset)) {
-    printf(msgCharset, tsCharset);
-    uPrint(msgCharset, tsCharset);
+    uForcePrint("Invalid charset:%s, please set the valid charset in config file", tsCharset);
     exit(-1);
   }
 }
\ No newline at end of file

src/mnode/src/mgmtShell.c

@@ -377,7 +377,7 @@ static int mgmtShellRetriveAuth(char *user, char *spi, char *encrypt, char *secr
 
   if (!sdbIsMaster()) {
     *secret = 0;
-    return TSDB_CODE_SUCCESS;
+    return TSDB_CODE_NOT_READY;
   }
 
   SUserObj *pUser = mgmtGetUser(user);
@@ -596,4 +596,4 @@ void* mgmtCloneQueuedMsg(SQueuedMsg *pSrcMsg) {
   pSrcMsg->pUser = NULL;
   
   return pDestMsg;
-}
\ No newline at end of file
+}

src/os/linux/src/linuxSysPara.c

@@ -225,10 +225,11 @@ static void taosGetSystemLocale() {  // get and set default locale
   if (cfg_locale && cfg_locale->cfgStatus < TAOS_CFG_CSTATUS_DEFAULT) {
     locale = setlocale(LC_CTYPE, "");
     if (locale == NULL) {
-      uError("can't get locale from system");
+      uForcePrint("can't get locale from system, set it to en_US.UTF-8");
+      strcpy(tsLocale, "en_US.UTF-8");
     } else {
       strncpy(tsLocale, locale, tListLen(tsLocale));
-      uPrint("locale not configured, set to system default:%s", tsLocale);
+      uForcePrint("locale not configured, set to system default:%s", tsLocale);
     }
   }
 
@@ -243,7 +244,10 @@ static void taosGetSystemLocale() {  // get and set default locale
       strncpy(tsCharset, revisedCharset, tListLen(tsCharset));
 
       free(revisedCharset);
-      uPrint("charset not configured, set to system default:%s", tsCharset);
+      uForcePrint("charset not configured, set to system default:%s", tsCharset);
+    } else {
+      strcpy(tsCharset, "UTF-8");
+      uForcePrint("can't get locale and charset from system, set it to UTF-8");
     }
   }
 }

src/plugins/http/src/httpServer.c

@@ -508,7 +508,7 @@ void httpAcceptHttpConnection(void *arg) {
               pServer->serverPort);
     return;
   } else {
-    httpPrint("http service init success at ip:%s:%u", pServer->serverIp, pServer->serverPort);
+    httpPrint("http service init success at %u", pServer->serverPort);
     pServer->online = true;
   }
 

src/rpc/src/rpcMain.c

@@ -613,11 +613,13 @@ static SRpcConn *rpcAllocateServerConn(SRpcInfo *pRpc, SRecvInfo *pRecv) {
     pConn->tranId = (uint16_t)(rand() & 0xFFFF);
     pConn->ownId = htonl(pConn->sid);
     pConn->linkUid = pHead->linkUid;
-    if (pRpc->afp && (*pRpc->afp)(pConn->user, &pConn->spi, &pConn->encrypt, pConn->secret, pConn->ckey) < 0) {
-      tWarn("%s %p, user not there", pRpc->label, pConn);
-      taosFreeId(pRpc->idPool, sid);   // sid shall be released
-      terrno = TSDB_CODE_INVALID_USER;
-      pConn = NULL;
+    if (pRpc->afp) {
+      terrno = (*pRpc->afp)(pConn->user, &pConn->spi, &pConn->encrypt, pConn->secret, pConn->ckey);
+      if (terrno != 0) {
+        tWarn("%s %p, user not there or server not ready", pRpc->label, pConn);
+        taosFreeId(pRpc->idPool, sid);   // sid shall be released
+        pConn = NULL;
+      }
     }
   }      
 
@@ -643,10 +645,11 @@ static SRpcConn *rpcGetConnObj(SRpcInfo *pRpc, int sid, SRecvInfo *pRecv) {
 
   if (sid) {
     pConn = pRpc->connList + sid;
-  } else {
-    pConn = rpcAllocateServerConn(pRpc, pRecv);
+    if (pConn->user[0] == 0) pConn = NULL;
   } 
 
+  if (pConn == NULL) pConn = rpcAllocateServerConn(pRpc, pRecv);
+
   if (pConn) {
     if (pConn->linkUid != pHead->linkUid) {
       tTrace("%s %p, linkUid:0x%x not matched, received:0x%x", pRpc->label, pConn, pConn->linkUid, pHead->linkUid);
@@ -1333,7 +1336,8 @@ static int rpcCheckAuthentication(SRpcConn *pConn, char *msg, int msgLen) {
   if ( !rpcIsReq(pHead->msgType) ) {
     // for response, if code is auth failure, it shall bypass the auth process
     code = htonl(pHead->code);
-    if (code==TSDB_CODE_INVALID_TIME_STAMP || code==TSDB_CODE_AUTH_FAILURE || code==TSDB_CODE_INVALID_USER) {
+    if (code==TSDB_CODE_INVALID_TIME_STAMP || code==TSDB_CODE_AUTH_FAILURE || 
+        code==TSDB_CODE_INVALID_USER || code == TSDB_CODE_NOT_READY) {
       pHead->msgLen = (int32_t)htonl((uint32_t)pHead->msgLen);
       return 0;
     } 

src/tsdb/src/tsdbRWHelper.c

@@ -570,24 +570,14 @@ static int tsdbCheckAndDecodeColumnData(SDataCol *pDataCol, char *content, int32
     pDataCol->len = (*(tDataTypeDesc[pDataCol->type].decompFunc))(
         content, len - sizeof(TSCKSUM), numOfPoints, pDataCol->pData, pDataCol->spaceSize, comp, buffer, bufferSize);
     if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
-      pDataCol->len += (sizeof(int32_t) * maxPoints);
       dataColSetOffset(pDataCol, numOfPoints);
     }
   } else {
     // No need to decompress, just memcpy it
-    switch (pDataCol->type) {
-      case TSDB_DATA_TYPE_BINARY:
-      case TSDB_DATA_TYPE_NCHAR:
-        pDataCol->len = sizeof(int32_t) * maxPoints;
-        memcpy((char *)pDataCol->pData + pDataCol->len, content, len - sizeof(TSCKSUM));
-        pDataCol->len += (len - sizeof(TSCKSUM));
-        dataColSetOffset(pDataCol, numOfPoints);
-        break;
-
-      default:
-        pDataCol->len = len - sizeof(TSCKSUM);
-        memcpy(pDataCol->pData, content, pDataCol->len);
-        break;
+    pDataCol->len = len - sizeof(TSCKSUM);
+    memcpy(pDataCol->pData, content, pDataCol->len);
+    if (pDataCol->type == TSDB_DATA_TYPE_BINARY || pDataCol->type == TSDB_DATA_TYPE_NCHAR) {
+      dataColSetOffset(pDataCol, numOfPoints);
     }
   }
   return 0;

tests/script/general/cache/cache_balance.sim

@@ -43,7 +43,7 @@ endw
 
 sleep 3000
 system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 
 sleep 20000
 sql select * from log.dn_192_168_0_1

tests/script/general/db/backup/keep.sim

@@ -21,7 +21,7 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 
 print ========= start other dnodes
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 3000
 

tests/script/general/show/dnodes.sim

@@ -4,8 +4,8 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 
 print =============== unsupport
-sql_error create dnode 192.168.0.2
-sql_error drop dnode 192.168.0.2
+sql_error create dnode $hostname2
+sql_error drop dnode $hostname2
 
 print =============== show dnodes
 sql show dnodes;

tests/script/unique/account/authority.sim

@@ -84,11 +84,11 @@ sql alter user read pass 'taosdata' -x step23
   return -1
 step23:
 
-sql create dnode 192.168.0.2 -x step24
+sql create dnode $hostname2 -x step24
   return -1
 step24:
 
-sql drop dnode 192.168.0.2 -x step25
+sql drop dnode $hostname2 -x step25
   return -1
 step25:
 

tests/script/unique/big/balance.sim

@@ -92,7 +92,7 @@ if $data00 != $totalNum then
 endi
 
 print ========== step1
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 
 $x = 0
@@ -144,12 +144,12 @@ if $data00 != $totalNum then
 endi
 
 print ========== step2
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 sleep 10000
 
 print ========== step3
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 
 $x = 0
 show3: 
@@ -206,7 +206,7 @@ if $data00 != $totalNum then
 endi
 
 print ========== step4
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 
 $x = 0
 show4: 
@@ -260,7 +260,7 @@ endi
 
 print ========== step5
 sql alter database db replica 2
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec.sh -n dnode4 -s start
 
 $x = 0

tests/script/unique/big/maxvnodes.sim

@@ -48,7 +48,7 @@ system sh/cfg.sh -n dnode2 -c maxShellConns       -v 100000
 system sh/cfg.sh -n dnode2 -c maxMgmtConnections  -v 100000
 
 print ==========  step2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 
 $x = 0

tests/script/unique/cluster/backup/balance4.sim

@@ -87,9 +87,9 @@ connectTbase:
 	endi
 sql connect -x connectTbase
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
+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
@@ -189,7 +189,7 @@ endi
 
 print ============================== step2
 print ========= start dnode5
-sql create dnode 192.168.0.5
+sql create dnode $hostname5
 system sh/exec.sh -n dnode5 -s start
 sleep 9000
 
@@ -219,7 +219,7 @@ endi
 
 print ============================== step3
 print ========= drop dnode2
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 9000
 
 $x = 0
@@ -261,7 +261,7 @@ system sh/exec.sh -n dnode2 -s stop
 
 print ============================== step4
 print ========= start dnode2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 10000
 
@@ -290,7 +290,7 @@ endi
 
 print ============================== step5
 print ========= drop dnode3
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 sleep 9000
 
 $x = 0
@@ -332,7 +332,7 @@ system sh/exec.sh -n dnode3 -s stop
 
 print ============================== step6
 print ========= start dnode3
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 sleep 9000
 
@@ -361,7 +361,7 @@ endi
 
 print ============================== step7
 print ========= drop dnode4
-sql drop dnode 192.168.0.4
+sql drop dnode $hostname4
 sleep 9000
 
 $x = 0
@@ -403,7 +403,7 @@ system sh/exec.sh -n dnode4 -s stop
 
 print ============================== step8
 print ========= start dnode4
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec.sh -n dnode4 -s start
 sleep 9000
 
@@ -432,7 +432,7 @@ endi
 
 print ============================== step9
 print ========= drop dnode5
-sql drop dnode 192.168.0.5
+sql drop dnode $hostname5
 sleep 9000
 
 $x = 0
@@ -474,7 +474,7 @@ system sh/exec.sh -n dnode5 -s stop
 
 print ============================== step10
 print ========= start dnode5
-sql create dnode 192.168.0.5
+sql create dnode $hostname5
 system sh/exec.sh -n dnode5 -s start
 sleep 9000
 
@@ -507,7 +507,7 @@ system sh/exec.sh -n dnode1 -s stop
 print stop dnode1 and sleep 10000
 sleep 10000
 
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 
@@ -548,7 +548,7 @@ endi
 
 print ============================== step12
 print ========= start dnode1
-sql create dnode 192.168.0.1
+sql create dnode $hostname1
 system sh/exec.sh -n dnode1 -s start
 sleep 12000
 

tests/script/unique/cluster/backup/balance5.sim

@@ -87,10 +87,10 @@ connectTbase:
 	endi
 sql connect -x connectTbase
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
-sql create dnode 192.168.0.5
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sql create dnode $hostname5
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start
@@ -173,7 +173,7 @@ endi
 print ============================== step2
 print ========= start dnode6
 
-sql create dnode 192.168.0.6
+sql create dnode $hostname6
 system sh/exec.sh -n dnode6 -s start
 
 sql create database c_b5_d3 replica 5
@@ -239,7 +239,7 @@ system sh/exec.sh -n dnode1 -s stop
 print stop dnode1 and sleep 10000
 sleep 10000
 
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 
@@ -309,13 +309,13 @@ sql insert into c_b5_t4 values(now+3s, 43)
 sql insert into c_b5_t4 values(now+4s, 42)
 sql insert into c_b5_t4 values(now+5s, 41)
 
-sql create dnode 192.168.0.1
+sql create dnode $hostname1
 system sh/exec.sh -n dnode1 -s start
 sleep 2000
 
-sql create dnode 192.168.0.7
+sql create dnode $hostname7
 system sh/exec.sh -n dnode7 -s start
-sql create dnode 192.168.0.8
+sql create dnode $hostname8
 system sh/exec.sh -n dnode8 -s start
 sleep 9000
 

tests/script/unique/cluster/backup/balancex.sim

@@ -85,9 +85,9 @@ connectTbase:
 	endi
 sql connect -x connectTbase
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
+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
@@ -184,7 +184,7 @@ sql insert into c_bx_t3 values(now+3s, 33)
 sql insert into c_bx_t3 values(now+4s, 32)
 sql insert into c_bx_t3 values(now+5s, 31)
 
-sql create dnode 192.168.0.5
+sql create dnode $hostname5
 system sh/exec.sh -n dnode5 -s start
 sleep 9000
 
@@ -218,7 +218,7 @@ system sh/exec.sh -n dnode1 -s stop  -x SIGINT
 print stop dnode1 and sleep 10000
 sleep 10000
 
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 

tests/script/unique/cluster/balance1.sim

@@ -64,7 +64,7 @@ endi
 print ============================== step2
 print ========= start dnode2
 sleep 2000
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 5000
 
@@ -111,7 +111,7 @@ sql insert into c_b1_t3 values(1520000024031, 31)
 
 print ============================== step4
 print ========= drop dnode2
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 9000
 
 $x = 0
@@ -155,7 +155,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
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 sleep 9000
 
 $x = 0
@@ -194,7 +194,7 @@ system sh/exec.sh -n dnode1 -s stop -x SIGINT
 print stop dnode1 and sleep 10000
 sleep 10000
 
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 
@@ -230,7 +230,7 @@ print dnode4 ==> $dnode4Role
 
 print ============================== step7
 print ========= add dnode1
-sql create dnode 192.168.0.1
+sql create dnode $hostname1
 sleep 3000
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
@@ -276,7 +276,7 @@ print ========= drop dnode2
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 print stop dnode2 and sleep 10000
 sleep 20000
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 print drop dnode2 and sleep 9000
 sleep 19000
 
@@ -316,7 +316,7 @@ endi
 
 print ============================== step9
 print ========= add dnode2
-sql create dnode 192.168.0.2
+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
@@ -406,7 +406,7 @@ endi
 print ============================== step11
 print ========= drop dnode2
 sleep 2000
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 9000
 
 $x = 0
@@ -452,7 +452,7 @@ error3:
 
 print ============================== step13
 print ========= add dnode2
-sql create dnode 192.168.0.2
+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
@@ -516,7 +516,7 @@ print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role
 
 sleep 2000
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 sleep 15000
 
@@ -586,8 +586,8 @@ print dnode4 ==> $dnode4Role
 
 print ========== add dnode4
 sleep 2000
-sql create dnode 192.168.0.4
-print sql create dnode 192.168.0.4 over
+sql create dnode $hostname4
+print sql create dnode $hostname4 over
 system sh/exec.sh -n dnode4 -s start
 print sleep 12000
 sleep 12000
@@ -626,7 +626,7 @@ endi
 print ============================== step16
 print ========= drop dnode4, create db9
 
-sql drop dnode 192.168.0.4
+sql drop dnode $hostname4
 sleep 10000
 sql create database c_b1_d9 tables 4
 sql use c_b1_d9

tests/script/unique/cluster/balance1_bug.sim

@@ -64,7 +64,7 @@ endi
 print ============================== step2
 print ========= start dnode2
 sleep 2000
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 5000
 
@@ -111,7 +111,7 @@ sql insert into c_b1_t3 values(now+5s, 31)
 
 print ============================== step4
 print ========= drop dnode2
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 9000
 
 $x = 0
@@ -149,7 +149,7 @@ print ========= add dnode2
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 sleep 5000
 system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 sleep 9000
 
 $x = 0
@@ -188,7 +188,7 @@ system sh/exec.sh -n dnode1 -s stop -x SIGINT
 print stop dnode1 and sleep 10000
 sleep 10000
 
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 
@@ -224,7 +224,7 @@ print dnode4 ==> $dnode4Role
 
 print ============================== step7
 print ========= add dnode1
-sql create dnode 192.168.0.1
+sql create dnode $hostname1
 sleep 23000
 system sh/exec.sh -n dnode1 -s start
 sleep 14000
@@ -264,7 +264,7 @@ print ========= drop dnode2
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 print stop dnode2 and sleep 10000
 sleep 20000
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 print drop dnode2 and sleep 9000
 sleep 19000
 
@@ -304,7 +304,7 @@ endi
 
 print ============================== step9
 print ========= add dnode2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 9000
 
@@ -388,7 +388,7 @@ endi
 print ============================== step11
 print ========= drop dnode2
 sleep 2000
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 9000
 
 $x = 0
@@ -434,7 +434,7 @@ error3:
 
 print ============================== step13
 print ========= add dnode2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 9000
 
@@ -506,7 +506,7 @@ print dnode3 ==> $dnode3Role
 print dnode4 ==> $dnode4Role
 
 sleep 2000
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 sleep 15000
 
@@ -576,8 +576,8 @@ print dnode4 ==> $dnode4Role
 
 print ========== add dnode4
 sleep 2000
-sql create dnode 192.168.0.4
-print sql create dnode 192.168.0.4 over
+sql create dnode $hostname4
+print sql create dnode $hostname4 over
 system sh/exec.sh -n dnode4 -s start
 print sleep 12000
 sleep 12000
@@ -616,7 +616,7 @@ endi
 print ============================== step16
 print ========= drop dnode4, create db9
 
-sql drop dnode 192.168.0.4
+sql drop dnode $hostname4
 sleep 10000
 sql create database c_b1_d9 tables 4
 sql use c_b1_d9

tests/script/unique/cluster/balance1_single.sim

@@ -34,7 +34,7 @@ print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 
 $x = 0
@@ -93,7 +93,7 @@ endi
 print ============================== step2
 print ========= start dnode3
 sleep 3000
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 sleep 8000
 
@@ -141,7 +141,7 @@ sql insert into c_b1_t3 values(now+5s, 31)
 
 print ============================== step4
 print ========= drop dnode3
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 sleep 9000
 
 $x = 0
@@ -179,7 +179,7 @@ print ========= add dnode3
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
 sleep 5000
 system sh/exec.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 sleep 9000
 
 $x = 0
@@ -208,7 +208,7 @@ system sh/exec.sh -n dnode2 -s stop -x SIGINT
 print stop dnode2 and sleep 10000
 sleep 10000
 
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 print drop dnode2 and sleep 9000
 sleep 9000
 
@@ -236,7 +236,7 @@ endi
 
 print ============================== step7
 print ========= add dnode2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 9000
 
@@ -265,7 +265,7 @@ print ========= drop dnode3
 system sh/exec.sh -n dnode3 -s stop -x SIGINT
 print stop dnode3 and sleep 10000
 sleep 10000
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 print drop dnode3 and sleep 9000
 sleep 9000
 
@@ -291,7 +291,7 @@ endi
 
 print ============================== step9
 print ========= add dnode3
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 sleep 9000
 
@@ -354,7 +354,7 @@ sql insert into c_b1_t2 values(now+1s, 25)
 
 print ============================== step11
 print ========= drop dnode3
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 sleep 9000
 
 $x = 0
@@ -386,7 +386,7 @@ sql use c_b1_d5
 
 print ============================== step13
 print ========= add dnode3
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 sleep 9000
 
@@ -436,7 +436,7 @@ print dnode3 $dnode3Vnodes
 
 print ============================== step14
 print ========= add dnode4
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec.sh -n dnode4 -s start
 sleep 10000
 
@@ -488,8 +488,8 @@ sql insert into c_b1_t8 values(now+5s, 81)
 
 
 print ========== add dnode5
-sql create dnode 192.168.0.5
-print sql create dnode 192.168.0.5 over
+sql create dnode $hostname5
+print sql create dnode $hostname5 over
 system sh/exec.sh -n dnode5 -s start
 print sleep 12000
 sleep 12000
@@ -528,7 +528,7 @@ endi
 print ============================== step16
 print ========= drop dnode5, create db9
 
-sql drop dnode 192.168.0.5
+sql drop dnode $hostname5
 sleep 10000
 sql create database c_b1_d9 tables 4
 sql use c_b1_d9

tests/script/unique/cluster/balance2.sim

@@ -50,8 +50,8 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 sleep 4001
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
+sql create dnode $hostname2
+sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sleep 4001
@@ -110,7 +110,7 @@ endi
 
 print ============================== step2
 print ========= drop dnode2
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 9000
 
 $x = 0
@@ -152,7 +152,7 @@ system sh/exec.sh -n dnode2 -s stop  -x SIGINT
 
 print ============================== step3
 print ========= start dnode2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 
 sleep 3000
 system sh/deploy.sh -n dnode2 -i 2
@@ -202,7 +202,7 @@ print dnode4 ==> $dnode4Role
 
 print ============================== step4
 print ========= drop dnode3
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 sleep 9000
 
 $x = 0
@@ -244,7 +244,7 @@ system sh/exec.sh -n dnode3 -s stop  -x SIGINT
 
 print ============================== step5
 print ========= start dnode3
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 
 sleep 3000
 system sh/deploy.sh -n dnode3 -i 3
@@ -298,7 +298,7 @@ system sh/exec.sh -n dnode1 -s stop  -x SIGINT
 print stop dnode1 and sleep 10000
 sleep 10000
 
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 
@@ -339,7 +339,7 @@ print dnode4 ==> $dnode4Role
 
 print ============================== step7
 print ========= start dnode1
-sql create dnode 192.168.0.1
+sql create dnode $hostname1
 
 sql show mnodes
 $dnode1Role = $data3_192.168.0.1
@@ -410,7 +410,7 @@ sql insert into c_b2_t4 values(1520000022043, 43)
 sql insert into c_b2_t4 values(1520000023042, 42)
 sql insert into c_b2_t4 values(1520000024041, 41)
 
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec.sh -n dnode4 -s start
 sleep 9000
 
@@ -456,8 +456,8 @@ endi
 
 print ============================== step9
 print ========= drop dnode1.4
-sql drop dnode 192.168.0.1
-sql drop dnode 192.168.0.4
+sql drop dnode $hostname1
+sql drop dnode $hostname4
 sleep 10000
 
 sql show mnodes
@@ -505,8 +505,8 @@ system sh/exec.sh -n dnode4 -s stop  -x SIGINT
 
 print ============================== step10
 print ========= start dnode1.4
-sql create dnode 192.168.0.1
-sql create dnode 192.168.0.4
+sql create dnode $hostname1
+sql create dnode $hostname4
 
 sleep 3000
 system sh/deploy.sh -n dnode1 -i 1

tests/script/unique/cluster/balance3.sim

@@ -60,8 +60,8 @@ system sh/exec.sh -n dnode1 -s start
 sql connect
 sleep 2001
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
+sql create dnode $hostname2
+sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sleep 3001
@@ -125,7 +125,7 @@ endi
 
 print ============================== step2
 print ========= start dnode4
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec.sh -n dnode4 -s start
 sleep 9000
 
@@ -152,7 +152,7 @@ endi
 
 print ============================== step3
 print ========= drop dnode2
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 9000
 
 $x = 0
@@ -196,7 +196,7 @@ 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
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 10000
 
@@ -223,7 +223,7 @@ endi
 
 print ============================== step5
 print ========= drop dnode3
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 sleep 9000
 
 $x = 0
@@ -268,7 +268,7 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 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 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 sleep 9000
 
@@ -295,7 +295,7 @@ endi
 
 print ============================== step7
 print ========= drop dnode4
-sql drop dnode 192.168.0.4
+sql drop dnode $hostname4
 sleep 9000
 
 $x = 0
@@ -339,7 +339,7 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 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 192.168.0.4
+sql create dnode $hostname4
 system sh/exec.sh -n dnode4 -s start
 sleep 9000
 
@@ -370,7 +370,7 @@ system sh/exec.sh -n dnode1 -s stop  -x SIGINT
 print stop dnode1 and sleep 10000
 sleep 10000
 
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 
@@ -413,7 +413,7 @@ 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 3000
-sql create dnode 192.168.0.1
+sql create dnode $hostname1
 system sh/exec.sh -n dnode1 -s start
 sleep 9000
 
@@ -490,7 +490,7 @@ endi
 
 print ============================== step12
 print ========= drop dnode1
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 sleep 10000
 
 $x = 0

tests/script/unique/column/replica3.sim

@@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode3 -c numofMpeers -v 3
 
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
+sql create dnode $hostname2
+sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 

tests/script/unique/db/commit.sim

@@ -22,7 +22,7 @@ sql connect
 sleep 3000
 
 print ========= start other dnodes
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 3000
 

tests/script/unique/db/delete.sim

@@ -22,9 +22,9 @@ system sh/cfg.sh -n dnode3 -c cacheBlockSize -v 200
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 sleep 3000
 

tests/script/unique/db/delete_part.sim

@@ -37,7 +37,7 @@ system sh/cfg.sh -n dnode4 -c tables -v 4
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 3000
 

tests/script/unique/db/replica_add12.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
@@ -32,9 +28,9 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 sleep 3000
 
@@ -77,19 +73,19 @@ endi
 sleep 2000
 
 sql show dnodes
-print dnode192.168.0.1 ==> openVnodes: $data3_1
-print dnode192.168.0.2 ==> openVnodes: $data3_2
-print dnode192.168.0.3 ==> openVnodes: $data3_3
+print dnode1 ==> openVnodes: $data3_1
+print dnode2 ==> openVnodes: $data3_2
+print dnode3 ==> openVnodes: $data3_3
 
-if $data3_1 != 0 then
+if $data2_1 != 0 then
    return -1
 endi
 
-if $data3_2 != 2 then
+if $data2_2 != 2 then
    return -1
 endi
 
-if $data3_3 != 2 then
+if $data2_3 != 2 then
    return -1
 endi
 
@@ -103,19 +99,19 @@ sleep 10000
 print ======== step3
 	
 sql show dnodes
-print dnode192.168.0.1 ==> openVnodes: $data3_1
-print dnode192.168.0.2 ==> openVnodes: $data3_2
-print dnode192.168.0.3 ==> openVnodes: $data3_3
+print dnode1 ==> openVnodes: $data3_1
+print dnode2 ==> openVnodes: $data3_2
+print dnode3 ==> openVnodes: $data3_3
 
-if $data3_1 != 0 then
+if $data2_1 != 0 then
    return -1
 endi
 
-if $data3_2 != 4 then
+if $data2_2 != 4 then
   return -1
 endi
 
-if $data3_3 != 4 then
+if $data2_3 != 4 then
   return -1
 endi
 
@@ -174,15 +170,13 @@ endi
 
 print ===== insert data
 
-sql insert into d1.t1 values(now, 3)
-# no master
+sql_error insert into d1.t1 values(now, 3)
 sql_error insert into d2.t2 values(now, 3)
-sql insert into d3.t3 values(now, 3)
-# no master
+sql_error insert into d3.t3 values(now, 3)
 sql_error insert into d4.t4 values(now, 3)
 
 sql select * from d1.t1
-if $rows != 3 then
+if $rows != 2 then
 	return -1
 endi
 
@@ -192,7 +186,7 @@ if $rows != 2 then
 endi
 
 sql select * from d3.t3
-if $rows != 3 then
+if $rows != 2 then
 	return -1
 endi
 
@@ -205,8 +199,11 @@ print ========= step6
 system sh/exec_up.sh -n dnode2 -s start
 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 select * from d1.t1
 if $rows != 3 then
 	return -1
@@ -232,20 +229,28 @@ print ========= step61
 system sh/exec_up.sh -n dnode3 -s stop -x SIGINT
 sleep 5000
 
-# no master
-sql_error insert into d1.t1 values(now, 4)
-sql insert into d2.t2 values(now, 4)
-# no master
-sql_error insert into d3.t3 values(now, 4)
-sql insert into d4.t4 values(now, 4)
+sql_error insert into d1.t1 values(now, 3)
+sql_error insert into d2.t2 values(now, 3)
+sql_error insert into d3.t3 values(now, 3)
+sql_error insert into d4.t4 values(now, 3)
+
+sql select * from d1.t1
+if $rows != 3 then
+	return -1
+endi
 
 sql select * from d2.t2
-if $rows != 4 then
+if $rows != 3 then
+	return -1
+endi
+
+sql select * from d3.t3
+if $rows != 3 then
 	return -1
 endi
 
 sql select * from d4.t4
-if $rows != 4 then
+if $rows != 3 then
 	return -1
 endi
 
@@ -264,7 +269,7 @@ if $rows != 4 then
 endi
 
 sql select * from d2.t2
-if $rows != 5 then
+if $rows != 4 then
 	return -1
 endi
 
@@ -274,6 +279,6 @@ if $rows != 4 then
 endi
 
 sql select * from d4.t4
-if $rows != 5 then
+if $rows != 4 then
 	return -1
 endi
\ No newline at end of file

tests/script/unique/db/replica_add13.sim

@@ -32,11 +32,11 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec_up.sh -n dnode4 -s start
 sleep 3000
 
@@ -93,10 +93,10 @@ show3:
 	endi
 	
 sql show dnodes
-print dnode192.168.0.1 ==> openVnodes: $data3_1
-print dnode192.168.0.2 ==> openVnodes: $data3_2
-print dnode192.168.0.3 ==> openVnodes: $data3_3
-print dnode192.168.0.4 ==> openVnodes: $data3_4
+print dnode1 ==> openVnodes: $data3_1
+print dnode2 ==> openVnodes: $data3_2
+print dnode3 ==> openVnodes: $data3_3
+print dnode4 ==> openVnodes: $data3_4
 
 if $data3_1 != 0 then
    return -1

tests/script/unique/db/replica_add23.sim

@@ -32,11 +32,11 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec_up.sh -n dnode4 -s start
 sleep 3000
 
@@ -93,10 +93,10 @@ show3:
 	endi
 	
 sql show dnodes
-print dnode192.168.0.1 ==> openVnodes: $data3_1
-print dnode192.168.0.2 ==> openVnodes: $data3_2
-print dnode192.168.0.3 ==> openVnodes: $data3_3
-print dnode192.168.0.4 ==> openVnodes: $data3_4
+print dnode1 ==> openVnodes: $data3_1
+print dnode2 ==> openVnodes: $data3_2
+print dnode3 ==> openVnodes: $data3_3
+print dnode4 ==> openVnodes: $data3_4
 
 if $data3_1 != 0 then
    return -1

tests/script/unique/db/replica_part.sim

@@ -22,9 +22,9 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 sleep 3000
 

tests/script/unique/db/replica_reduce21.sim

@@ -22,7 +22,7 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 3000
 

tests/script/unique/db/replica_reduce31.sim

@@ -22,9 +22,9 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 sleep 3000
 

tests/script/unique/db/replica_reduce32.sim

@@ -22,9 +22,9 @@ system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 print ========= start dnodes
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 sleep 3000
 

tests/script/unique/dnode/balance1.sim

@@ -56,7 +56,7 @@ endi
 
 print ========== step2
 sleep 2000
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 
 $x = 0
@@ -97,7 +97,7 @@ if $data3_2 != 2 then
 endi
 
 print ========== step4
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 
 $x = 0
 show4: 
@@ -123,7 +123,7 @@ endi
 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 
 print ========== step5
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 
 $x = 0
@@ -173,7 +173,7 @@ if $data3_3 != 3 then
 endi
 
 print ========== step7
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec_up.sh -n dnode4 -s start
 
 $x = 0
@@ -231,7 +231,7 @@ if $data3_4 != 2 then
 endi
 
 print ========== step9
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 
 $x = 0
 show9: 

tests/script/unique/dnode/balance2.sim

@@ -40,8 +40,8 @@ print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
+sql create dnode $hostname2
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode2 -s start
 system sh/exec_up.sh -n dnode3 -s start
 sleep 3000
@@ -77,7 +77,7 @@ if $data3_3 != 2 then
 endi
 
 print ========== step2
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 
 $x = 0
 show2: 
@@ -104,7 +104,7 @@ endi
 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 
 print ========== step3
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec_up.sh -n dnode4 -s start
 
 $x = 0
@@ -161,7 +161,7 @@ if $data3_4 != 1 then
 endi
 
 print ========== step5
-sql create dnode 192.168.0.5
+sql create dnode $hostname5
 system sh/exec_up.sh -n dnode5 -s start
 
 $x = 0
@@ -195,7 +195,7 @@ if $data3_5 != 2 then
 endi
 
 print ========== step6
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 
 $x = 0
 show6: 

tests/script/unique/dnode/balance3.sim

@@ -46,9 +46,9 @@ print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
 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
@@ -90,7 +90,7 @@ if $data3_4 != 2 then
 endi
 
 print ========== step2
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 
 $x = 0
 show2: 
@@ -122,7 +122,7 @@ endi
 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 
 print ========== step
-sql create dnode 192.168.0.5
+sql create dnode $hostname5
 system sh/exec_up.sh -n dnode5 -s start
 
 $x = 0
@@ -197,7 +197,7 @@ if $data3_5 != 1 then
 endi
 
 print ========== step5
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 
 $x = 0
@@ -225,7 +225,7 @@ endi
 sleep 8000
 
 print ========== step6
-sql drop dnode 192.168.0.3
+sql drop dnode $hostname3
 
 $x = 0
 show6: 

tests/script/unique/dnode/balancex.sim

@@ -58,7 +58,7 @@ if $data3_1 != 2 then
 endi
 
 print ========== step2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 
 $x = 0
@@ -106,7 +106,7 @@ if $data3_2 != 1 then
 endi
 
 print ========== step3
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 
 $x = 0
@@ -131,7 +131,7 @@ if $data3_3 != 2 then
 endi
 
 print ========== step5
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 
 $x = 0
 show5: 

tests/script/unique/dnode/basic1.sim

@@ -33,7 +33,7 @@ if $data01 != 192.168.0.1 then
 endi
 
 print =============== create dnodes
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 sql show dnodes;
 if $rows != 2 then 
   return -1

tests/script/unique/dnode/monitor_bug.sim

@@ -33,7 +33,7 @@ if $data3_1 != 3 then
 endi
 
 print ========== step2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 
 $x = 0

tests/script/unique/dnode/offline1.sim

@@ -31,7 +31,7 @@ system sh/cfg.sh -n dnode3 -c clog -v 1
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 3000
 

tests/script/unique/dnode/offline2.sim

@@ -31,7 +31,7 @@ system sh/cfg.sh -n dnode3 -c clog -v 1
 print ========== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 3000
 
@@ -71,9 +71,9 @@ if $data4_192.168.0.2 != offline then
 endi
 
 print ========== step4
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 
 sleep 5000
 $x = 0

tests/script/unique/dnode/remove1.sim

@@ -58,7 +58,7 @@ if $data3_1 != 2 then
 endi
 
 print ========== step2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 9000
 
@@ -89,7 +89,7 @@ if $data3_2 != 1 then
 endi
 
 print ========== step3
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 
 sleep 7001
 $x = 0
@@ -105,7 +105,7 @@ print dnode1 openVnodes $data3_1
 print dnode2 openVnodes $data3_2 $data5_192.168.0.2
 
 print ========== step4
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 
 $x = 0
@@ -127,7 +127,7 @@ endi
 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 
 print ========== step5
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec_up.sh -n dnode4 -s start
 
 $x = 0

tests/script/unique/dnode/remove2.sim

@@ -58,7 +58,7 @@ if $data3_1 != 2 then
 endi
 
 print ========== step2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 9000
 
@@ -90,7 +90,7 @@ endi
 
 print ========== step3
 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 7001
 
 $x = 0
@@ -106,7 +106,7 @@ print dnode1 openVnodes $data3_1
 print dnode2 openVnodes $data3_2 $data5_192.168.0.2
 
 print ========== step4
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 
 $x = 0

tests/script/unique/dnode/vnode_clean.sim

@@ -49,7 +49,7 @@ if $data3_1 != 3 then
 endi
 
 print ========== step2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec_up.sh -n dnode2 -s start
 
 $x = 0
@@ -91,7 +91,7 @@ if $data3_2 != 2 then
 endi
 
 print ========== step4
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 
 $x = 0
 show4: 
@@ -117,7 +117,7 @@ system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 
 print ========== step5
 sleep 2000
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
@@ -163,7 +163,7 @@ if $data3_2 != 1 then
 endi
 
 print ========== step7
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec_up.sh -n dnode3 -s start
 
 $x = 0
@@ -219,7 +219,7 @@ if $data3_3 != 2 then
 endi
 
 print ========== step9
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 
 $x = 0
 show9: 

tests/script/unique/import/replica2.sim

@@ -35,7 +35,7 @@ system sh/exec.sh -n dnode1 -s start
 sleep 3000
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 
 sql create database ir2db replica 2 days 7

tests/script/unique/import/replica3.sim

@@ -35,9 +35,9 @@ system sh/exec.sh -n dnode1 -s start
 sleep 5000
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 
 

tests/script/unique/metrics/balance_replica1.sim

@@ -82,7 +82,7 @@ if $dnode2Vnodes != null then
   goto show1
 endi
 print =============== step3 start dnode2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 8000
 

tests/script/unique/metrics/dnode2.sim

@@ -14,7 +14,7 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 
 $x = 0

tests/script/unique/metrics/dnode2_stop.sim

@@ -13,7 +13,7 @@ system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 
 $x = 0

tests/script/unique/metrics/dnode3.sim

@@ -19,9 +19,9 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 
 $x = 0

tests/script/unique/metrics/replica2_dnode4.sim

@@ -24,9 +24,9 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
+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

tests/script/unique/metrics/replica2_vnode3.sim

@@ -13,7 +13,7 @@ system sh/cfg.sh -n dnode2 -c sessionsPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 
 $x = 0

tests/script/unique/metrics/replica3_dnode6.sim

@@ -38,11 +38,11 @@ system sh/cfg.sh -n dnode6 -c sessionsPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
-sql create dnode 192.168.0.5
-sql create dnode 192.168.0.6
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sql create dnode $hostname5
+sql create dnode $hostname6
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 system sh/exec.sh -n dnode4 -s start

tests/script/unique/metrics/replica3_vnode3.sim

@@ -24,9 +24,9 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
+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

tests/script/unique/mnode/mgmt22.sim

@@ -41,7 +41,7 @@ if $data2_2 != slave then
 endi
 
 print ============== step3
-sql_error drop dnode 192.168.0.1 -x error1
+sql_error drop dnode $hostname1 -x error1
 print should not drop master
 
 print ============== step4
@@ -50,11 +50,12 @@ sql_error show mnodes
 print error of no master
 
 print ============== step5
-sql_error drop dnode 192.168.0.1 
+sql_error drop dnode $hostname1
 print error of no master
 
 print ============== step6
 system sh/exec_up.sh -n dnode1 -s start
+sleep 2000
 sql close
 sql connect
 
@@ -66,7 +67,7 @@ show6:
 		return -1
 	endi
 	
-sql show mnodes
+sql show mnodes -x show6
 print dnode1 ==> $data2_1
 print dnode2 ==> $data2_2
 if $data2_1 != master then
@@ -78,7 +79,7 @@ endi
 
 print ============== step7
 system sh/exec_up.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 sleep 5000
 
 $x = 0
@@ -92,7 +93,7 @@ show7:
 sql show mnodes
 print dnode1 ==> $data2_1
 print dnode2 ==> $data2_2
-print dnode3 ==> $data3_3
+print dnode3 ==> $data2_3
 if $data2_1 != master then
 	goto show7
 endi

tests/script/unique/mnode/mgmt23.sim

@@ -20,7 +20,7 @@ endi
 
 print ============== step2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 
 $x = 0
 show2:
@@ -42,13 +42,13 @@ endi
 
 print ============== step3
 system sh/exec_up.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -64,13 +64,13 @@ if $dnode3Role != null then
 endi
 
 print ============== step4
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -89,16 +89,16 @@ system sh/exec_up.sh -n dnode2 -s stop
 
 print ============== step5
 sleep 2000
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/exec_up.sh -n dnode2 -s start
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -120,7 +120,7 @@ sleep 10000
 sql_error show mnodes
 
 print ============== step7
-sql_error drop dnode 192.168.0.1
+sql_error drop dnode $hostname1
 
 system sh/exec_up.sh -n dnode1 -s stop
 system sh/exec_up.sh -n dnode2 -s stop

tests/script/unique/mnode/mgmt24.sim

@@ -20,7 +20,7 @@ endi
 
 print ============== step2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 
 $x = 0
 show2: 
@@ -45,11 +45,11 @@ system sh/exec_up.sh -n dnode1 -s stop
 sql_error show mnodes
 
 print ============== step4
-sql_error drop dnode 192.168.0.1 
+sql_error drop dnode $hostname1 
 
 print ============== step5
 system sh/exec_up.sh -n dnode1 -s start
-sql_error create dnode 192.168.0.1
+sql_error create dnode $hostname1
 
 sql close
 sql connect

tests/script/unique/mnode/mgmt25.sim

@@ -20,7 +20,7 @@ endi
 
 print ============== step2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 
 $x = 0
 show2: 
@@ -42,13 +42,13 @@ endi
 
 print ============== step3
 system sh/exec_up.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 sleep 6000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -64,13 +64,13 @@ if $dnode3Role != null then
 endi
 
 print ============== step4
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 6000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role

tests/script/unique/mnode/mgmt26.sim

@@ -20,7 +20,7 @@ endi
 
 print ============== step2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 
 $x = 0
 show2: 
@@ -42,13 +42,13 @@ endi
 
 print ============== step3
 system sh/exec_up.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 sleep 6000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -65,13 +65,13 @@ endi
 
 
 print ============== step4
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 6000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -92,13 +92,13 @@ system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 sleep 5000
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 sleep 6000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role

tests/script/unique/mnode/mgmt33.sim

@@ -27,13 +27,13 @@ endi
 
 print ============== step2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -50,13 +50,13 @@ endi
 
 print ============== step3
 system sh/exec_up.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -72,13 +72,13 @@ if $dnode3Role != slave then
 endi
 
 print ============== step4
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -101,13 +101,13 @@ system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/exec_up.sh -n dnode2 -s start
 
 print ============== step5
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
+$dnode1Role = $data2_1
 $dnode2Role = $data3_4
-$dnode3Role = $data3_3
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -127,9 +127,9 @@ system sh/exec_up.sh -n dnode1 -s stop
 sleep 10000
 
 sql show mnodes
-$dnode1Role = $data3_1
+$dnode1Role = $data2_1
 $dnode2Role = $data3_4
-$dnode3Role = $data3_3
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -145,13 +145,13 @@ endi
 #endi
 
 print ============== step7
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role

tests/script/unique/mnode/mgmt34.sim

@@ -36,14 +36,14 @@ endi
 
 print ============== step2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
-$dnode4Role = $data3_4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -64,14 +64,14 @@ endi
 
 print ============== step3
 system sh/exec_up.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
-$dnode4Role = $data3_4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -93,14 +93,14 @@ endi
 
 print ============== step4
 system sh/exec_up.sh -n dnode4 -s start
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
-$dnode4Role = $data3_4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -120,14 +120,14 @@ if $dnode4Role != null then
 endi
 
 print ============== step5
-sql drop dnode 192.168.0.2
+sql drop dnode $hostname2
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
-$dnode4Role = $data3_4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -154,14 +154,14 @@ system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/exec_up.sh -n dnode2 -s start
 
 print ============== step6
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
-$dnode4Role = $data3_4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -185,10 +185,10 @@ system sh/exec_up.sh -n dnode1 -s stop
 sleep 4000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
-$dnode4Role = $data3_4
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -199,14 +199,14 @@ if $dnode1Role != offline then
 endi
 
 print ============== step8
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 sleep 8000
 
 sql show mnodes
-$dnode1Role = $data3_1
+$dnode1Role = $data2_1
 $dnode2Role = $data3_5
-$dnode3Role = $data3_3
-$dnode4Role = $data3_4
+$dnode3Role = $data2_3
+$dnode4Role = $data2_4
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role

tests/script/unique/mnode/mgmtr2.sim

@@ -13,9 +13,9 @@ sql connect
 sleep 3000
 
 sql show mnodes
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role
@@ -31,9 +31,9 @@ if $dnode3Role != null then
 endi
 
 print ============== step2
-sql create dnode 192.168.0.2 
+sql create dnode $hostname2 
 sleep 1700
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 
 print ============== step3
 print ========= start dnode2 and dnode3
@@ -58,9 +58,9 @@ system sh/exec_up.sh -n dnode3 -s start
 print ============== step4
 sql show mnodes
 
-$dnode1Role = $data3_1
-$dnode2Role = $data3_2
-$dnode3Role = $data3_3
+$dnode1Role = $data2_1
+$dnode2Role = $data2_2
+$dnode3Role = $data2_3
 print dnode1 ==> $dnode1Role
 print dnode2 ==> $dnode2Role
 print dnode3 ==> $dnode3Role

tests/script/unique/mnode/secondIp.sim

@@ -7,7 +7,7 @@ system sh/exec_up.sh -n dnode2 -s start
 sql connect
 
 print ========== step2 connect to dnode2
-sql create dnode 192.168.0.1
+sql create dnode $hostname1
 system sh/exec_up.sh -n dnode1 -s start
 sleep 3000
 

tests/script/unique/stream/metrics_balance.sim

@@ -201,7 +201,7 @@ if $dnode2Vnodes != null then
 endi
 
 print =============== step4 start dnode2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 8000
 

tests/script/unique/stream/metrics_replica1_dnode2.sim

@@ -14,7 +14,7 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 $x = 0
 createDnode: 

tests/script/unique/stream/metrics_replica2_dnode2.sim

@@ -10,7 +10,7 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 $x = 0
 createDnode: 

tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim

@@ -14,7 +14,7 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 $x = 0
 createDnode: 

tests/script/unique/stream/metrics_replica2_dnode3.sim

@@ -19,9 +19,9 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 $x = 0
 createDnode: 

tests/script/unique/stream/metrics_replica3_dnode4.sim

@@ -24,11 +24,11 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec.sh -n dnode4 -s start
 
 $x = 0

tests/script/unique/stream/metrics_vnode_stop.sim

@@ -12,7 +12,7 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 $x = 0
 createDnode: 
@@ -114,7 +114,7 @@ connectTbase2:
 sql connect -x connectTbase2
 sleep 3000
 
-sql create dnode 192.168.0.1
+sql create dnode $hostname1
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 print ======================== dnode start

tests/script/unique/stream/table_balance.sim

@@ -136,7 +136,7 @@ if $dnode2Vnodes != null then
 endi
 
 print =============== step4 start dnode2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 8000
 

tests/script/unique/stream/table_move.sim

@@ -173,7 +173,7 @@ if $dnode2Vnodes != null then
 endi
 
 print =============== step4 start dnode2
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 8000
 
@@ -202,7 +202,7 @@ system sh/exec.sh -n dnode1 -s stop
 print stop dnode1 and sleep 10000
 sleep 10000
 
-sql drop dnode 192.168.0.1
+sql drop dnode $hostname1
 print drop dnode1 and sleep 9000
 sleep 9000
 

tests/script/unique/stream/table_replica1_dnode2.sim

@@ -14,7 +14,7 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 $x = 0
 createDnode: 

tests/script/unique/stream/table_replica2_dnode2.sim

@@ -10,7 +10,7 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 $x = 0
 createDnode: 

tests/script/unique/stream/table_replica2_dnode2_vnoden.sim

@@ -14,7 +14,7 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 $x = 0
 createDnode: 

tests/script/unique/stream/table_replica2_dnode3.sim

@@ -20,9 +20,9 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 $x = 0
 createDnode: 

tests/script/unique/stream/table_replica3_dnode4.sim

@@ -24,11 +24,11 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
-sql create dnode 192.168.0.4
+sql create dnode $hostname4
 system sh/exec.sh -n dnode4 -s start
 $x = 0
 createDnode: 

tests/script/unique/stream/table_vnode_stop.sim

@@ -12,7 +12,7 @@ system sh/exec.sh -n dnode1 -s start
 
 sql connect
 
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 $x = 0
 createDnode: 
@@ -115,7 +115,7 @@ connectTbase2:
 sql connect -x connectTbase2
 sleep 3000
 
-sql create dnode 192.168.0.1
+sql create dnode $hostname1
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
 print ======================== dnode start

tests/script/unique/table/delete_part.sim

@@ -37,7 +37,7 @@ system sh/cfg.sh -n dnode4 -c sessionsPerVnode -v 4
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 3000
 

tests/script/unique/vnode/backup/replica4.sim

@@ -25,9 +25,9 @@ connectTbase:
 	endi
 sql connect -x connectTbase
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
+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

tests/script/unique/vnode/backup/replica5.sim

@@ -29,10 +29,10 @@ connectTbase:
 	endi
 sql connect -x connectTbase
 
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
-sql create dnode 192.168.0.5
+sql create dnode $hostname2
+sql create dnode $hostname3
+sql create dnode $hostname4
+sql create dnode $hostname5
 
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start

tests/script/unique/vnode/commit.sim

@@ -10,7 +10,7 @@ system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 3000
 

tests/script/unique/vnode/many.sim

@@ -26,8 +26,8 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
+sql create dnode $hostname2
+sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sleep 3000

tests/script/unique/vnode/replica2_basic.sim

@@ -10,7 +10,7 @@ system sh/cfg.sh -n dnode2 -c numofMpeers -v 3
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
 sleep 3000
 

tests/script/unique/vnode/replica2_basic2.sim

@@ -32,9 +32,9 @@ system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 print ========= start dnodes
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.3
+sql create dnode $hostname3
 system sh/exec.sh -n dnode3 -s start
 sleep 3000
 
@@ -77,9 +77,9 @@ if $rows != 1 then
 endi
 
 sql show dnodes
-print dnode192.168.0.1 ==> openVnodes: $data2_192.168.0.1  freeVnodes: $data3_192.168.0.1
-print dnode192.168.0.2 ==> openVnodes: $data2_192.168.0.2  freeVnodes: $data3_192.168.0.2
-print dnode192.168.0.3 ==> openVnodes: $data2_192.168.0.3  freeVnodes: $data3_192.168.0.3
+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
 
 if $data2_192.168.0.1 != 0 then
  return -1

tests/script/unique/vnode/replica2_repeat.sim

@@ -22,8 +22,8 @@ system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
+sql create dnode $hostname2
+sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sleep 3000

tests/script/unique/vnode/replica3_basic.sim

@@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode3 -c numofMpeers -v 3
 
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
+sql create dnode $hostname2
+sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sleep 3000

tests/script/unique/vnode/replica3_repeat.sim

@@ -23,9 +23,9 @@ system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
 system sh/exec.sh -n dnode1 -s start
 
 sql connect
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
+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

tests/script/unique/vnode/replica3_vgroup.sim

@@ -14,8 +14,8 @@ system sh/cfg.sh -n dnode3 -c numofMpeers -v 3
 
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
+sql create dnode $hostname2
+sql create dnode $hostname3
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
 sleep 3000

tests/script/windows/account/authority.sim

@@ -70,11 +70,11 @@ sql alter user read pass 'taosdata' -x step23
   return -1
 step23:
 
-sql create dnode 192.168.0.2 -x step24
+sql create dnode $hostname2 -x step24
   return -1
 step24:
 
-sql drop dnode 192.168.0.2 -x step25
+sql drop dnode $hostname2 -x step25
   return -1
 step25:
 

tests/tsim/src/simExe.c

@@ -414,6 +414,7 @@ void simCloseNativeConnect(SScript *script) {
 
   simTrace("script:%s, taos:%p closed", script->fileName, script->taos);
   taos_close(script->taos);
+  taosMsleep(1000);
 
   script->taos = NULL;
 }