diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h index 47c629e14cb65ff8f57357083d2a9db8b0c8ced7..7cb9c513e5e504212ac2ec47e3b1d93a21a6279f 100644 --- a/src/client/inc/tsclient.h +++ b/src/client/inc/tsclient.h @@ -311,8 +311,6 @@ typedef struct SSqlObj { void (*fp)(); void (*fetchFp)(); void * param; - uint32_t ip; - short vnode; int64_t stime; uint32_t queryId; void * pStream; diff --git a/src/inc/tbalance.h b/src/inc/tbalance.h index 9ffa6332c60957b2e86f1ad6fec4c64c4a64f43f..fee045254534b7f15016b610a772dd30b1b76971 100644 --- a/src/inc/tbalance.h +++ b/src/inc/tbalance.h @@ -26,6 +26,7 @@ struct SDnodeObj; int32_t balanceInit(); void balanceCleanUp(); void balanceNotify(); +void balanceUpdateMgmt(); void balanceReset(); int32_t balanceAllocVnodes(struct SVgObj *pVgroup); int32_t balanceDropDnode(struct SDnodeObj *pDnode); diff --git a/src/mnode/src/mgmtBalance.c b/src/mnode/src/mgmtBalance.c index 17d4a4114b6404670c320e2a3d1533754bdfa299..d16a06fc5cc2a8241623c621c918794e56f4c01f 100644 --- a/src/mnode/src/mgmtBalance.c +++ b/src/mnode/src/mgmtBalance.c @@ -29,6 +29,7 @@ int32_t balanceInit() { return TSDB_CODE_SUCCESS; } void balanceCleanUp() {} void balanceNotify() {} +void balanceUpdateMgmt() {} void balanceReset() {} int32_t balanceAllocVnodes(SVgObj *pVgroup) { diff --git a/src/mnode/src/mgmtDnode.c b/src/mnode/src/mgmtDnode.c index 6629737787e9fad3ba609d4a4da6fdbbd1c9006c..90ee40dc93b39db4918297bf08a3ad2e81e13e2c 100644 --- a/src/mnode/src/mgmtDnode.c +++ b/src/mnode/src/mgmtDnode.c @@ -322,6 +322,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) { if (pDnode->status == TAOS_DN_STATUS_OFFLINE) { mTrace("dnode:%d, from offline to online", pDnode->dnodeId); pDnode->status = TAOS_DN_STATUS_READY; + balanceUpdateMgmt(); balanceNotify(); } diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c index 1f87b9fd5306bcccd7b28fb63c874956defa34dc..11772e1d3a6a54b26a923098c936a180de0a61ef 100644 --- a/src/rpc/src/rpcMain.c +++ b/src/rpc/src/rpcMain.c @@ -219,7 +219,7 @@ void *rpcOpen(const SRpcInit *pInit) { pRpc->numOfThreads = pInit->numOfThreads>TSDB_MAX_RPC_THREADS ? TSDB_MAX_RPC_THREADS:pInit->numOfThreads; pRpc->localPort = pInit->localPort; pRpc->afp = pInit->afp; - pRpc->sessions = pInit->sessions; + pRpc->sessions = pInit->sessions+1; if (pInit->user) strcpy(pRpc->user, pInit->user); if (pInit->secret) strcpy(pRpc->secret, pInit->secret); if (pInit->ckey) strcpy(pRpc->ckey, pInit->ckey); @@ -247,7 +247,7 @@ void *rpcOpen(const SRpcInit *pInit) { return NULL; } - pRpc->idPool = taosInitIdPool(pRpc->sessions); + pRpc->idPool = taosInitIdPool(pRpc->sessions-1); if (pRpc->idPool == NULL) { tError("%s failed to init ID pool", pRpc->label); rpcClose(pRpc); diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c index c665ef9679fc0d830ea105512e5b3da5b8d07678..efdf7529608b272230f804437d71377f1fc6feea 100644 --- a/src/util/src/tsocket.c +++ b/src/util/src/tsocket.c @@ -32,6 +32,8 @@ int taosGetFqdn(char *fqdn) { uError("failed to get host name"); return -1; } + + free(h); } uint32_t taosGetIpFromFqdn(const char *fqdn) { diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c index 03e508c5bf02f692e2616613d5bc60aa8526c804..2a7d133039616e7d77847e5478b38adaa39b9dc2 100644 --- a/src/vnode/src/vnodeMain.c +++ b/src/vnode/src/vnodeMain.c @@ -194,9 +194,10 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) { pVnode->wqueue = dnodeAllocateWqueue(pVnode); pVnode->rqueue = dnodeAllocateRqueue(pVnode); - SCqCfg cqCfg; + SCqCfg cqCfg = {0}; sprintf(cqCfg.user, "root"); strcpy(cqCfg.pass, tsInternalPass); + cqCfg.vgId = vnode; cqCfg.cqWrite = vnodeWriteToQueue; pVnode->cq = cqOpen(pVnode, &cqCfg); diff --git a/tests/script/sh/exec.sh b/tests/script/sh/exec.sh index 86d78a441354f13316303787f6967108533450b8..f3fcd0325fa72f0c85fe34a9c0133364370509d7 100755 --- a/tests/script/sh/exec.sh +++ b/tests/script/sh/exec.sh @@ -70,28 +70,14 @@ if [ "$CLEAR_OPTION" = "clear" ]; then rm -rf $MGMT_DIR fi -if [ "$SHELL_OPTION" = "true" ]; then - if [ "$EXEC_OPTON" = "start" ]; then - echo "ExcuteCmd:" $EXE_DIR/taos -c $CFG_DIR -u $USERS -p - $EXE_DIR/taos -c $CFG_DIR -u $USERS -p - else - #relative path - RCFG_DIR=sim/$NODE_NAME/cfg - PID=`ps -ef|grep -v taosd | grep taos | grep $RCFG_DIR | grep -v grep | awk '{print $2}'` - if [ -n "$PID" ]; then - sudo kill -9 $PID - fi - fi - return -fi - if [ "$EXEC_OPTON" = "start" ]; then echo "ExcuteCmd:" $EXE_DIR/taosd -c $CFG_DIR - nohup $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & - #TT=`date +%s` - #mkdir ${LOG_DIR}/${TT} - #echo valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes $EXE_DIR/taosd -c $CFG_DIR - #nohup valgrind --log-file=${LOG_DIR}/${TT}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & + + if [ "$SHELL_OPTION" = "true" ]; then + nohup valgrind --log-file=${LOG_DIR}/valgrind.log --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & + else + nohup $EXE_DIR/taosd -c $CFG_DIR > /dev/null 2>&1 & + fi else #relative path diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim index ea51b057787e2cf579410e97a4736736c44283c9..33de448c37f39622a800063cd45c59127a94cae4 100644 --- a/tests/script/unique/dnode/balance1.sim +++ b/tests/script/unique/dnode/balance1.sim @@ -1,10 +1,5 @@ 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 @@ -49,8 +44,8 @@ sql insert into d1.t1 values(now+4s, 12) sql insert into d1.t1 values(now+5s, 11) sql show dnodes -print dnode1 openVnodes $data3_1 -if $data3_1 != 1 then +print dnode1 openVnodes $data2_1 +if $data2_1 != 1 then return -1 endi @@ -68,12 +63,12 @@ show2: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 0 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 0 then goto show2 endi -if $data3_2 != 1 then +if $data2_2 != 1 then goto show2 endi @@ -87,12 +82,12 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 0 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 0 then return -1 endi -if $data3_2 != 2 then +if $data2_2 != 2 then return -1 endi @@ -108,12 +103,12 @@ show4: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 2 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 2 then goto show4 endi -if $data3_2 != null then +if $data2_2 != null then goto show4 endi if $rows != 1 then @@ -135,16 +130,16 @@ show5: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -if $data3_1 != 0 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +if $data2_1 != 0 then goto show5 endi -if $data3_2 != null then +if $data2_2 != null then goto show5 endi -if $data3_3 != 2 then +if $data2_3 != 2 then goto show5 endi @@ -158,17 +153,17 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 -if $data3_1 != 0 then +if $data2_1 != 0 then return -1 endi -if $data3_2 != null then +if $data2_2 != null then return -1 endi -if $data3_3 != 3 then +if $data2_3 != 3 then return -1 endi @@ -185,20 +180,20 @@ show7: endi sql show dnodes -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 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 +if $data2_1 != 0 then goto show7 endi -if $data3_2 != null then +if $data2_2 != null then goto show7 endi -if $data3_3 != 2 then +if $data2_3 != 2 then goto show7 endi -if $data3_4 != 1 then +if $data2_4 != 1 then goto show7 endi @@ -212,21 +207,21 @@ sql insert into d4.t4 values(now+4s, 42) sql insert into d4.t4 values(now+5s, 41) sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 -if $data3_1 != 0 then +if $data2_1 != 0 then return -1 endi -if $data3_2 != null then +if $data2_2 != null then return -1 endi -if $data3_3 != 2 then +if $data2_3 != 2 then return -1 endi -if $data3_4 != 2 then +if $data2_4 != 2 then return -1 endi @@ -242,21 +237,21 @@ show9: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 -if $data3_1 != 0 then +if $data2_1 != 0 then goto show9 endi -if $data3_2 != null then +if $data2_2 != null then goto show9 endi -if $data3_3 != null then +if $data2_3 != null then goto show9 endi -if $data3_4 != 4 then +if $data2_4 != 4 then goto show9 endi diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim index 047d40cf9abd15bd8e22af266955d45a1be125ed..decec25683af6d86d172f964e99604651d0de143 100644 --- a/tests/script/unique/dnode/balance2.sim +++ b/tests/script/unique/dnode/balance2.sim @@ -1,29 +1,11 @@ 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/deploy.sh -n dnode5 -i 5 -system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode5 -c balanceMonitorInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode5 -c balanceStartInterval -v 10 - 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 @@ -63,16 +45,16 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +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 @@ -88,16 +70,16 @@ show2: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -if $data3_1 != 2 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +if $data2_1 != 2 then goto show2 endi -if $data3_2 != null then +if $data2_2 != null then goto show2 endi -if $data3_3 != 2 then +if $data2_3 != 2 then goto show2 endi @@ -116,20 +98,20 @@ show3: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 +if $data2_1 != 0 then goto show3 endi -if $data3_2 != null then +if $data2_2 != null then goto show3 endi -if $data3_3 != 2 then +if $data2_3 != 2 then goto show3 endi -if $data3_4 != 2 then +if $data2_4 != 2 then goto show3 endi @@ -143,20 +125,20 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 +if $data2_1 != 0 then return -1 endi -if $data3_2 != null then +if $data2_2 != null then return -1 endi -if $data3_3 != 1 then +if $data2_3 != 3 then return -1 endi -if $data3_4 != 1 then +if $data2_4 != 3 then return -1 endi @@ -173,24 +155,24 @@ show5: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 -print dnode5 openVnodes $data3_5 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 +print dnode5 openVnodes $data2_5 +if $data2_1 != 0 then goto show5 endi -if $data3_2 != null then +if $data2_2 != null then goto show5 endi -if $data3_3 != 2 then +if $data2_3 != 2 then goto show5 endi -if $data3_4 != 2 then +if $data2_4 != 2 then goto show5 endi -if $data3_5 != 2 then +if $data2_5 != 2 then goto show5 endi @@ -206,28 +188,31 @@ show6: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 -print dnode5 openVnodes $data3_5 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 +print dnode5 openVnodes $data2_5 +if $data2_1 != 0 then goto show6 endi -if $data3_2 != null then +if $data2_2 != null then goto show6 endi -if $data3_3 != null then +if $data2_3 != null then goto show6 endi -if $data3_4 != 1 then +if $data2_4 != 3 then goto show6 endi -if $data3_5 != 1 then +if $data2_5 != 3 then goto show6 endi -system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +system sh/exec_up.sh -n dnode2 -s stop -x SIGINT + +sql reset query cache +sleep 1000 print ========== step7 sql select * from d1.t1 order by t desc diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim index 70d3f98a726474a53f29c760e2d525dca785b188..14be27878f6d74218b256550c1ef904bc59ae5fc 100644 --- a/tests/script/unique/dnode/balance3.sim +++ b/tests/script/unique/dnode/balance3.sim @@ -1,12 +1,5 @@ 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 @@ -14,20 +7,6 @@ system sh/deploy.sh -n dnode4 -i 4 system sh/deploy.sh -n dnode5 -i 5 system sh/deploy.sh -n dnode6 -i 6 -system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode5 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode6 -c balanceMonitorInterval -v 1 - -system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode5 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode6 -c balanceStartInterval -v 10 - 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 @@ -71,21 +50,21 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 -if $data3_1 != 4 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 -if $data3_4 != 2 then +if $data2_4 != 2 then return -1 endi @@ -101,21 +80,21 @@ show2: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 -if $data3_1 != 2 then +if $data2_1 != 2 then goto show2 endi -if $data3_2 != null then +if $data2_2 != null then goto show2 endi -if $data3_3 != 2 then +if $data2_3 != 2 then goto show2 endi -if $data3_4 != 2 then +if $data2_4 != 2 then goto show2 endi @@ -134,25 +113,25 @@ show3: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 -print dnode5 openVnodes $data3_5 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 +print dnode5 openVnodes $data2_5 -if $data3_1 != 4 then +if $data2_1 != 0 then goto show3 endi -if $data3_2 != null then +if $data2_2 != null then goto show3 endi -if $data3_3 != 2 then +if $data2_3 != 2 then goto show3 endi -if $data3_4 != 2 then +if $data2_4 != 2 then goto show3 endi -if $data3_5 != 2 then +if $data2_5 != 2 then goto show3 endi @@ -174,25 +153,25 @@ show4: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 -print dnode5 openVnodes $data3_5 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 +print dnode5 openVnodes $data2_5 -if $data3_1 != 4 then +if $data2_1 != 0 then goto show4 endi -if $data3_2 != null then +if $data2_2 != null then goto show4 endi -if $data3_3 != 1 then +if $data2_3 != 3 then goto show4 endi -if $data3_4 != 1 then +if $data2_4 != 3 then goto show4 endi -if $data3_5 != 1 then +if $data2_5 != 3 then goto show4 endi @@ -209,16 +188,16 @@ show5: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 -print dnode5 openVnodes $data3_5 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 +print dnode5 openVnodes $data2_5 -if $data3_1 != 4 then +if $data2_1 != 0 then goto show5 endi -if $data3_2 != 2 then +if $data2_2 != 2 then goto show5 endi @@ -236,30 +215,33 @@ show6: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -print dnode4 openVnodes $data3_4 -print dnode5 openVnodes $data3_5 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +print dnode4 openVnodes $data2_4 +print dnode5 openVnodes $data2_5 -if $data3_1 != 4 then +if $data2_1 != 0 then goto show6 endi -if $data3_2 != 1 then +if $data2_2 != 3 then goto show6 endi -if $data3_3 != null then +if $data2_3 != null then goto show6 endi -if $data3_4 != 1 then +if $data2_4 != 3 then goto show6 endi -if $data3_5 != 1 then +if $data2_5 != 3 then goto show6 endi system sh/exec_up.sh -n dnode3 -s stop -x SIGINT +sql reset query cache +sleep 1000 + print ========== step7 sql select * from d1.t1 order by t desc print $data01 $data11 $data21 $data31 $data41