diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h index 7642475f7002fb9a5a77b17c388849291c35a6da..dd0dd230fd4bcd24d279fa89d8381d1f1b79b28f 100644 --- a/src/common/inc/tglobal.h +++ b/src/common/inc/tglobal.h @@ -102,8 +102,7 @@ extern int32_t tsMaxMeterConnections; extern int32_t tsMaxVnodeConnections; extern int32_t tsMaxMgmtConnections; -extern int32_t tsBalanceMonitorInterval; -extern int32_t tsBalanceStartInterval; +extern int32_t tsBalanceInterval; extern int32_t tsOfflineThreshold; extern int32_t tsMgmtEqualVnodeNum; diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index eb81070f6dcc9917c12f03b5be88cfa73a690543..70b55b9d92ddc065bcdc75fbeee4cbb8dd783164 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -119,9 +119,8 @@ int32_t tsMaxMeterConnections = 10000; int32_t tsMaxMgmtConnections = 2000; int32_t tsMaxVnodeConnections = 10000; -int32_t tsBalanceMonitorInterval = 2; // seconds -int32_t tsBalanceStartInterval = 300; // seconds -int32_t tsOfflineThreshold = 864000; // seconds 10days +int32_t tsBalanceInterval = 300; // seconds +int32_t tsOfflineThreshold = 86400*100; // seconds 10days int32_t tsMgmtEqualVnodeNum = 4; int32_t tsEnableHttpModule = 1; @@ -406,7 +405,7 @@ static void doInitGlobalConfig() { taosInitConfigOption(cfg); cfg.option = "balanceInterval"; - cfg.ptr = &tsBalanceStartInterval; + cfg.ptr = &tsBalanceInterval; cfg.valType = TAOS_CFG_VTYPE_INT32; cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_SHOW; cfg.minValue = 1; diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim index 33de448c37f39622a800063cd45c59127a94cae4..72286aad9010b85be4fa76cde8c01a13f668aabd 100644 --- a/tests/script/unique/dnode/balance1.sim +++ b/tests/script/unique/dnode/balance1.sim @@ -5,15 +5,10 @@ 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 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 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 dnode1 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode2 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode3 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode4 -c balanceInterval -v 10 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim index 14be27878f6d74218b256550c1ef904bc59ae5fc..53fda28dc4d988a2a1632967b60bddecd32562b8 100644 --- a/tests/script/unique/dnode/balance3.sim +++ b/tests/script/unique/dnode/balance3.sim @@ -176,20 +176,21 @@ if $data2_5 != 3 then endi print ========== step5 -sql create dnode $hostname2 -system sh/exec_up.sh -n dnode2 -s start +sql create dnode $hostname6 +system sh/deploy.sh -n dnode6 -i 6 +system sh/exec_up.sh -n dnode6 -s start $x = 0 show5: $x = $x + 1 sleep 2000 - if $x == 20 then + if $x == 10 then return -1 endi sql show dnodes print dnode1 openVnodes $data2_1 -print dnode2 openVnodes $data2_2 +print dnode6 openVnodes $data2_6 print dnode3 openVnodes $data2_3 print dnode4 openVnodes $data2_4 print dnode5 openVnodes $data2_5 @@ -197,7 +198,7 @@ print dnode5 openVnodes $data2_5 if $data2_1 != 0 then goto show5 endi -if $data2_2 != 2 then +if $data2_6 != 2 then goto show5 endi @@ -216,7 +217,7 @@ show6: sql show dnodes print dnode1 openVnodes $data2_1 -print dnode2 openVnodes $data2_2 +print dnode6 openVnodes $data2_6 print dnode3 openVnodes $data2_3 print dnode4 openVnodes $data2_4 print dnode5 openVnodes $data2_5 @@ -224,7 +225,7 @@ print dnode5 openVnodes $data2_5 if $data2_1 != 0 then goto show6 endi -if $data2_2 != 3 then +if $data2_6 != 3 then goto show6 endi if $data2_3 != null then diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim index b251731c413914beb48ffa37360cccc296d00b0e..6c851b55594ce3c759d60241f70ab39c20f3ecee 100644 --- a/tests/script/unique/dnode/balancex.sim +++ b/tests/script/unique/dnode/balancex.sim @@ -1,25 +1,10 @@ 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 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 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 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 @@ -52,8 +37,8 @@ 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 -if $data3_1 != 2 then +print dnode1 openVnodes $data2_1 +if $data2_1 != 2 then return -1 endi @@ -70,12 +55,12 @@ show2: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 0 then goto show2 endi -if $data3_2 != 2 then +if $data2_2 != 2 then goto show2 endi @@ -96,12 +81,12 @@ show3: return -1 endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 3 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 1 then goto show3 endi -if $data3_2 != 1 then +if $data2_2 != 3 then goto show3 endi @@ -117,16 +102,16 @@ show4: return -1 endi 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 goto show4 endi -if $data3_2 != 2 then +if $data2_2 != 2 then goto show4 endi -if $data3_3 != 2 then +if $data2_3 != 2 then goto show4 endi @@ -141,21 +126,24 @@ show5: return -1 endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -if $data3_1 != 3 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +if $data2_1 != 1 then goto show5 endi -if $data3_2 != null then +if $data2_2 != null then goto show5 endi -if $data3_3 != 1 then +if $data2_3 != 3 then goto show5 endi system sh/exec_up.sh -n dnode2 -s stop -x SIGINT +sql reset query cache +sleep 1000 + print ========== step6 sql select * from d1.t1 order by t desc print $data01 $data11 $data21 $data31 $data41 diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim index 1550e379dc64fd599c535e8c3d8a569cb66df176..fda7f4ad77150caf5a18d769e8574ed0e9ecea1e 100644 --- a/tests/script/unique/dnode/monitor_bug.sim +++ b/tests/script/unique/dnode/monitor_bug.sim @@ -1,17 +1,8 @@ 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 balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode2 -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 dnode1 -c mgmtEqualVnodeNum -v 4 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim index 9b307d604ad6ccbf3e34c230a059d821515bd4da..c4751bb66bc959c3bdd661233b6a7bedf370801e 100644 --- a/tests/script/unique/dnode/offline1.sim +++ b/tests/script/unique/dnode/offline1.sim @@ -1,25 +1,17 @@ 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 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 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 dnode1 -c offlineThreshold -v 10 system sh/cfg.sh -n dnode2 -c offlineThreshold -v 10 system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10 +system sh/cfg.sh -n dnode1 -c balanceInterval -v 5 +system sh/cfg.sh -n dnode2 -c balanceInterval -v 5 +system sh/cfg.sh -n dnode3 -c balanceInterval -v 5 + 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 @@ -36,41 +28,42 @@ system sh/exec_up.sh -n dnode2 -s start sleep 3000 sql show dnodes -if $data4_192.168.0.1 != ready then +print dnode1 $data4_1 +print dnode1 $data4_2 + +if $data4_1 != ready then return -1 endi -if $data4_192.168.0.2 != ready then +if $data4_2 != ready then return -1 endi print ========== step2 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -sleep 6000 +sleep 8000 sql show dnodes -if $data4_192.168.0.1 != ready then +print dnode1 $data4_1 +print dnode1 $data4_2 + +if $data4_1 != ready then return -1 endi -if $data4_192.168.0.2 != offline then +if $data4_2 != offline then return -1 endi print ========== step3 sleep 10000 -$x = 0 -show4: - $x = $x + 1 - sleep 5000 - if $x == 20 then - return -1 - endi - sql show dnodes -if $data4_192.168.0.1 != ready then - goto show4 +print dnode1 $data4_1 +print dnode1 $data4_2 + +if $data4_1 != ready then + return -1 endi -if $data4_192.168.0.2 != null then - goto show4 +if $data4_2 != null then + return -1 endi diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim index d21e41845968bf096c58597a96e707dbf08bec4e..b9a3464811b3372e45b2b34e474c9156583ce367 100644 --- a/tests/script/unique/dnode/offline2.sim +++ b/tests/script/unique/dnode/offline2.sim @@ -1,25 +1,17 @@ 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 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 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 dnode1 -c offlineThreshold -v 10 system sh/cfg.sh -n dnode2 -c offlineThreshold -v 10 system sh/cfg.sh -n dnode3 -c offlineThreshold -v 10 +system sh/cfg.sh -n dnode1 -c balanceInterval -v 5 +system sh/cfg.sh -n dnode2 -c balanceInterval -v 5 +system sh/cfg.sh -n dnode3 -c balanceInterval -v 5 + 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 @@ -40,39 +32,49 @@ sql create table d1.t1(ts timestamp, i int) sql insert into d1.t1 values(now, 1) sql show dnodes -if $data4_192.168.0.1 != ready then +print dnode1 $data4_1 +print dnode1 $data4_2 + +if $data4_1 != ready then return -1 endi -if $data4_192.168.0.2 != ready then +if $data4_2 != ready then return -1 endi print ========== step2 system sh/exec_up.sh -n dnode2 -s stop -x SIGINT -sleep 5000 +sleep 8000 sql show dnodes -if $data4_192.168.0.1 != ready then +print dnode1 $data4_1 +print dnode1 $data4_2 + +if $data4_1 != ready then return -1 endi -if $data4_192.168.0.2 != offline then +if $data4_2 != offline then return -1 endi print ========== step3 -sleep 18000 +sleep 10000 sql show dnodes -if $data4_192.168.0.1 != ready then +print dnode1 $data4_1 +print dnode1 $data4_2 + +if $data4_1 != ready then return -1 endi -if $data4_192.168.0.2 != offline then +if $data4_2 != dropping then return -1 endi print ========== step4 sql create dnode $hostname3 system sh/exec_up.sh -n dnode3 -s start +system sh/exec_up.sh -n dnode2 -s start sql drop dnode $hostname2 sleep 5000 @@ -80,23 +82,25 @@ $x = 0 show4: $x = $x + 1 sleep 5000 - if $x == 20 then + if $x == 50 then return -1 endi sql show dnodes -if $data4_192.168.0.1 != ready then - return -1 +if $data4_1 != ready then + goto show4 endi -if $data4_192.168.0.2 != null then - return -1 +if $data4_2 != null then + goto show4 endi -if $data4_192.168.0.3 != ready then - return -1 +if $data4_3 != ready then + goto show4 endi print ======================== step5 -sleep 10000 +sql reset query cache +sleep 1000 + sql select * from d1.t1 if $rows != 1 then return -1 diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim index 721f912914ad58195dc8aa798048417a1b302e36..c345aa202b2a7cd9268d7ff58c2701dec39b6106 100644 --- a/tests/script/unique/dnode/remove1.sim +++ b/tests/script/unique/dnode/remove1.sim @@ -1,25 +1,10 @@ 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 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 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 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 @@ -52,8 +37,8 @@ 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 -if $data3_1 != 2 then +print dnode1 openVnodes $data2_1 +if $data2_1 != 2 then return -1 endi @@ -79,12 +64,12 @@ show2: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 3 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 3 then goto show2 endi -if $data3_2 != 1 then +if $data2_2 != 1 then goto show2 endi @@ -101,8 +86,8 @@ show3: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 $data5_192.168.0.2 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 print ========== step4 sql create dnode $hostname3 @@ -117,10 +102,10 @@ show4: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -if $data3_2 != null then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +if $data2_2 != null then goto show4 endi @@ -138,20 +123,20 @@ show5: return -1 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 != 4 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 diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim index 1e06c173175b9e18a370640aa4322c1102426581..909f82e61c9411cd3d97d8e7ef3a6714a450c428 100644 --- a/tests/script/unique/dnode/remove2.sim +++ b/tests/script/unique/dnode/remove2.sim @@ -1,25 +1,10 @@ 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 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 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 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 @@ -52,8 +37,8 @@ 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 -if $data3_1 != 2 then +print dnode1 openVnodes $data2_1 +if $data2_1 != 2 then return -1 endi @@ -79,12 +64,12 @@ show2: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 3 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 3 then goto show2 endi -if $data3_2 != 1 then +if $data2_2 != 1 then goto show2 endi @@ -102,8 +87,8 @@ show3: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 $data5_192.168.0.2 +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 $data5_192.168.0.2 print ========== step4 sql create dnode $hostname3 @@ -118,16 +103,16 @@ show4: endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -print dnode3 openVnodes $data3_3 -if $data3_2 != null then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +print dnode3 openVnodes $data2_3 +if $data2_2 != null then goto show4 endi -if $data3_1 != 3 then +if $data2_1 != 3 then goto show4 endi -if $data3_3 != 1 then +if $data2_3 != 1 then goto show4 endi diff --git a/tests/script/unique/dnode/testSuite.sim b/tests/script/unique/dnode/testSuite.sim index afb1cafd2c390d8888d87850b4e0ac92b7fd9727..9921cbf378e149b07f64caf217bbe3242a5838b4 100644 --- a/tests/script/unique/dnode/testSuite.sim +++ b/tests/script/unique/dnode/testSuite.sim @@ -4,10 +4,6 @@ run unique/dnode/balance3.sim run unique/dnode/balancex.sim run unique/dnode/offline1.sim run unique/dnode/offline2.sim -run unique/dnode/remove1.sim -run unique/dnode/remove2.sim -run unique/dnode/vnode_clean.sim - - - - +#run unique/dnode/remove1.sim +#run unique/dnode/remove2.sim +#run unique/dnode/vnode_clean.sim diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim index 2d55889af1b1ed9af46fa937cf0ef87bfed67993..3693868497f4d5c443dccd51f7b6ba57d39683da 100644 --- a/tests/script/unique/dnode/vnode_clean.sim +++ b/tests/script/unique/dnode/vnode_clean.sim @@ -1,25 +1,10 @@ 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 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 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 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 @@ -43,8 +28,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 != 3 then +print dnode1 openVnodes $data2_1 +if $data2_1 != 3 then return -1 endi @@ -60,12 +45,12 @@ show2: return -1 endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 4 then goto show2 endi -if $data3_2 != 3 then +if $data2_2 != 3 then goto show2 endi @@ -81,12 +66,12 @@ sql insert into d2.t2 values(now+5s, 21) $x = 0 sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 4 then return -1 endi -if $data3_2 != 2 then +if $data2_2 != 2 then return -1 endi @@ -101,12 +86,12 @@ show4: return -1 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 @@ -120,8 +105,7 @@ sleep 2000 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 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 +system sh/cfg.sh -n dnode2 -c balanceInterval -v 10 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 system sh/exec_up.sh -n dnode2 -s start @@ -134,12 +118,12 @@ show5: return -1 endi sql show dnodes -print dnode1 openVnodes $data3_1 -print dnode2 openVnodes $data3_2 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 4 then goto show5 endi -if $data3_2 != 2 then +if $data2_2 != 2 then goto show5 endi @@ -153,12 +137,12 @@ 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 -if $data3_1 != 4 then +print dnode1 openVnodes $data2_1 +print dnode2 openVnodes $data2_2 +if $data2_1 != 4 then return -1 endi -if $data3_2 != 1 then +if $data2_2 != 1 then return -1 endi @@ -175,16 +159,16 @@ show7: endi 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 != 4 then goto show7 endi -if $data3_2 != 2 then +if $data2_2 != 2 then goto show7 endi -if $data3_3 != 3 then +if $data2_3 != 3 then goto show7 endi @@ -205,16 +189,16 @@ show8: return -1 endi 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 != 4 then goto show8 endi -if $data3_2 != 2 then +if $data2_2 != 2 then goto show8 endi -if $data3_3 != 2 then +if $data2_3 != 2 then goto show8 endi @@ -230,16 +214,16 @@ show9: endi 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 != 4 then goto show9 endi -if $data3_2 != null then +if $data2_2 != null then goto show9 endi -if $data3_3 != 0 then +if $data2_3 != 0 then goto show9 endi diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim index 2339c4c36f1a89ea4e06f5be36cd836e3d9b4661..d32e647fbe61f7d6adf9fa0ee545a774c86a837c 100644 --- a/tests/script/unique/metrics/balance_replica1.sim +++ b/tests/script/unique/metrics/balance_replica1.sim @@ -8,10 +8,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 dnode1 -c statusInterval -v 1 system sh/cfg.sh -n dnode2 -c statusInterval -v 1 -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 dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 +system sh/cfg.sh -n dnode1 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode2 -c balanceInterval -v 10 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 mgmtEqualVnodeNum -v 0 diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim index 48702d584cc9a412dbb87a9cb9d71b02d009b64b..feac15f4dbbc5d2f03d35c12f8c9e4d2addca220 100644 --- a/tests/script/unique/stream/metrics_balance.sim +++ b/tests/script/unique/stream/metrics_balance.sim @@ -8,10 +8,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 dnode1 -c statusInterval -v 1 system sh/cfg.sh -n dnode2 -c statusInterval -v 1 -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 dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 +system sh/cfg.sh -n dnode1 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode2 -c balanceInterval -v 10 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 mgmtEqualVnodeNum -v 0 diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim index 2736b223b6b86d8ebc600d6b39bbd2984fc1d869..3eab0295296646f9ad14b04474822ac96ee87660 100644 --- a/tests/script/unique/stream/table_balance.sim +++ b/tests/script/unique/stream/table_balance.sim @@ -8,10 +8,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 dnode1 -c statusInterval -v 1 system sh/cfg.sh -n dnode2 -c statusInterval -v 1 -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 dnode1 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10 +system sh/cfg.sh -n dnode1 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode2 -c balanceInterval -v 10 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 mgmtEqualVnodeNum -v 0 diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim index b677aa95f006b74ba1c7419fdabccf60f45bd29e..3096bcc9f94c65244c436cf39d7224eb82e4c2be 100644 --- a/tests/script/unique/stream/table_move.sim +++ b/tests/script/unique/stream/table_move.sim @@ -20,15 +20,10 @@ system sh/cfg.sh -n dnode2 -c statusInterval -v 1 system sh/cfg.sh -n dnode3 -c statusInterval -v 1 system sh/cfg.sh -n dnode4 -c statusInterval -v 1 -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 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 dnode1 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode2 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode3 -c balanceInterval -v 10 +system sh/cfg.sh -n dnode4 -c balanceInterval -v 10 system sh/cfg.sh -n dnode1 -c clog -v 1 system sh/cfg.sh -n dnode2 -c clog -v 1