diff --git a/tests/script/general/agg/fill.sim b/tests/script/general/agg/fill.sim index 4056b9ef20a0158edf81083f88fad95eb9eb4703..de579238b8badf577b1d57fd5d787d7a0e8ecc76 100644 --- a/tests/script/general/agg/fill.sim +++ b/tests/script/general/agg/fill.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/agg/stream.sim b/tests/script/general/agg/stream.sim index a024ad9b809f933bfd61052bfc576c5044459b28..2217c39430f4fe35ba9412c98ab99ee19aa3c90e 100644 --- a/tests/script/general/agg/stream.sim +++ b/tests/script/general/agg/stream.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 print ========== step1 diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim index f9bac689fb43b1db17c3209d456f61a69e7a8275..52507b1992175cf538170db63c76174cebee2667 100644 --- a/tests/script/general/alter/cached_schema_after_alter.sim +++ b/tests/script/general/alter/cached_schema_after_alter.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/alter/count.sim b/tests/script/general/alter/count.sim index be76aaa1c16a660c45e93f61ffad5921efaba3b5..1b77f997ac7e225689b31ed973c1f8df462baaac 100644 --- a/tests/script/general/alter/count.sim +++ b/tests/script/general/alter/count.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 diff --git a/tests/script/general/alter/import.sim b/tests/script/general/alter/import.sim index 0cf70c8549cd0f5c01cb7438c4365c23cc056bb0..7348cc919ee342b2897ab8bdf82b1890d9c7225b 100644 --- a/tests/script/general/alter/import.sim +++ b/tests/script/general/alter/import.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim index c58dce02037c279f4d09f7260272bca74810f34e..0daa9c6432c8db7e11102d47ee8ce8144ff39041 100644 --- a/tests/script/general/alter/insert1.sim +++ b/tests/script/general/alter/insert1.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim index d749ddefb540b2bcb52d6b608bfc54e75e3ba3c0..34f935a04b6cc3d2099cb88f84417513e59dd16a 100644 --- a/tests/script/general/alter/insert2.sim +++ b/tests/script/general/alter/insert2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/alter/metrics.sim b/tests/script/general/alter/metrics.sim index a58d25c5beb668def72457df16c2d7d69413acc1..defe8d0fc1e9201dd8b3f035dfbe524eb0ae523d 100644 --- a/tests/script/general/alter/metrics.sim +++ b/tests/script/general/alter/metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/alter/table.sim b/tests/script/general/alter/table.sim index 6a0e62a0bf9aee5ea4dccf947adcbda97ea6423c..34630f4805a92976910616b3f785bbaaaf9465cd 100644 --- a/tests/script/general/alter/table.sim +++ b/tests/script/general/alter/table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/cache/cache_balance.sim b/tests/script/general/cache/cache_balance.sim index 1bc7d83e73929e381473bb654de89505e983f13d..b71e81023415081d4b4753e5db82a6e016e11370 100644 --- a/tests/script/general/cache/cache_balance.sim +++ b/tests/script/general/cache/cache_balance.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/cache/new_metrics.sim b/tests/script/general/cache/new_metrics.sim index 6af54766b886696ff2d3ba771d3a8848525ed84f..18335b60957640fbdd76d2b64105b4bcf471da3d 100644 --- a/tests/script/general/cache/new_metrics.sim +++ b/tests/script/general/cache/new_metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/cache/new_stream.sim b/tests/script/general/cache/new_stream.sim index 38559cb9366745700166196a5db181b7bcb1520b..23904a021044652c308481bad21062909f41233e 100644 --- a/tests/script/general/cache/new_stream.sim +++ b/tests/script/general/cache/new_stream.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/cache/restart_metrics.sim b/tests/script/general/cache/restart_metrics.sim index f4a607bf554feed0c542081cf48dd19a07b263a4..67d02722e21a8177a36a66408f753e60e906be68 100644 --- a/tests/script/general/cache/restart_metrics.sim +++ b/tests/script/general/cache/restart_metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 @@ -47,7 +47,7 @@ endi print =============== step2 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/cache/restart_stream.sim b/tests/script/general/cache/restart_stream.sim index 2f45f1873708704a3436e33561ef710c397f486e..b119dcf8567564f91e1a4895b2ee351363307e31 100644 --- a/tests/script/general/cache/restart_stream.sim +++ b/tests/script/general/cache/restart_stream.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1 @@ -97,7 +97,7 @@ endi print =============== step4 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1 diff --git a/tests/script/general/cache/restart_table.sim b/tests/script/general/cache/restart_table.sim index d7c02116fdc78ac5375d5c77e84090a1cdb64f13..c973293fdc5f56a8b2dfe15a59ebef2dee09bb2a 100644 --- a/tests/script/general/cache/restart_table.sim +++ b/tests/script/general/cache/restart_table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 @@ -35,7 +35,7 @@ endi print =============== step2 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10 diff --git a/tests/script/general/column/commit.sim b/tests/script/general/column/commit.sim index 3bc5d4e06a1eafe93e06aade68600bf338302c20..3a46cc73e856201bf5f45df7680669f76f46b17a 100644 --- a/tests/script/general/column/commit.sim +++ b/tests/script/general/column/commit.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/column/metrics.sim b/tests/script/general/column/metrics.sim index 94f5e6bb8a3410100c843db64049e757ebc0da01..119ab0108ce164279514915faccdfb81f894a95a 100644 --- a/tests/script/general/column/metrics.sim +++ b/tests/script/general/column/metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/column/stream.sim b/tests/script/general/column/stream.sim index 5ea04db04b8e2aeaaf4398cf01e6cbdee2a1258c..6972e341970b49afe211006c2b349a5a41d631cd 100644 --- a/tests/script/general/column/stream.sim +++ b/tests/script/general/column/stream.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 print ========== step1 diff --git a/tests/script/general/column/table.sim b/tests/script/general/column/table.sim index 85e11f43f4b6c1674d3119d5057983d11faea929..e4f3bea4664f68179a9ff47da1420f7b8fd6561b 100644 --- a/tests/script/general/column/table.sim +++ b/tests/script/general/column/table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/general/compress/commitlog.sim index 2323991044b985e22846ce26785f96b0ec314742..fdadfdac73cc98b8762f22b36e8002614b9e90c5 100644 --- a/tests/script/general/compress/commitlog.sim +++ b/tests/script/general/compress/commitlog.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 1 diff --git a/tests/script/general/compress/compress.sim b/tests/script/general/compress/compress.sim index 93e807e2dbc77df469fdff9f2a906e4d12d0ecfb..2d222ecbbe308085f75b8064dd00e46aec57d282 100644 --- a/tests/script/general/compress/compress.sim +++ b/tests/script/general/compress/compress.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 1 diff --git a/tests/script/general/compress/compress2.sim b/tests/script/general/compress/compress2.sim index e0053648e2f3b63cb001e6bcb2dc0a65eda46dfd..096875176e3701ad88c6b57a42c3d66e0fb80bc3 100644 --- a/tests/script/general/compress/compress2.sim +++ b/tests/script/general/compress/compress2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 2 diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/general/compress/uncompress.sim index 13b19300acffdab583e3bb731c395656f4be7a83..a26627d5e3fc33287e7e8f5891cb6b228811d386 100644 --- a/tests/script/general/compress/uncompress.sim +++ b/tests/script/general/compress/uncompress.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024 system sh/cfg.sh -n dnode1 -c compression -v 1 diff --git a/tests/script/general/compute/avg.sim b/tests/script/general/compute/avg.sim index 9afdce8b14dc95c8cb2a7e7cb7ac6d557bad9e99..ccc996dccb8b919e323a83c94d32dbeb73f3357f 100644 --- a/tests/script/general/compute/avg.sim +++ b/tests/script/general/compute/avg.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/bottom.sim b/tests/script/general/compute/bottom.sim index 889191f46875607184707e15ace6ff3aec3953e7..988ce74a035a8c06bf3d81fcb9fa38c674e92b84 100644 --- a/tests/script/general/compute/bottom.sim +++ b/tests/script/general/compute/bottom.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/count.sim b/tests/script/general/compute/count.sim index ead4a34a630f0c8552a76a98656c77cb7efd6b6c..e2c352ffd414b6a6e26382bc3c5ecafb765c6c60 100644 --- a/tests/script/general/compute/count.sim +++ b/tests/script/general/compute/count.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/diff.sim b/tests/script/general/compute/diff.sim index 7581f6b4bd9985f46d3c3010cf67c73886d3c0ef..bc5799db18fc21810455a237534e5f3983fb236d 100644 --- a/tests/script/general/compute/diff.sim +++ b/tests/script/general/compute/diff.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/diff2.sim b/tests/script/general/compute/diff2.sim index 2c831fc5a322dbe89c5f1a3c1eb76ceb00c6284e..ecd066619821f4bc545d8e8bd1e5a6dd3b798523 100644 --- a/tests/script/general/compute/diff2.sim +++ b/tests/script/general/compute/diff2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/first.sim b/tests/script/general/compute/first.sim index 9d98b61c1c6026917221c77a4e9231ce2ef87192..947fcf54441ad3b81c334f29fa90e284e4d0d753 100644 --- a/tests/script/general/compute/first.sim +++ b/tests/script/general/compute/first.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/interval.sim b/tests/script/general/compute/interval.sim index 36df589be9a43b08c0ac7a1cc3e34aa5929a7dea..d4052a47a1d7e97bba05cc71d5ff0a1eae5eddc2 100644 --- a/tests/script/general/compute/interval.sim +++ b/tests/script/general/compute/interval.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/last.sim b/tests/script/general/compute/last.sim index ef851e973e1cf7c70e1b4bbe2bb90ac52ce041ba..ffd43689493ce0f467f0200fd1911a5073c3d23f 100644 --- a/tests/script/general/compute/last.sim +++ b/tests/script/general/compute/last.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/leastsquare.sim b/tests/script/general/compute/leastsquare.sim index 1f9d7fa4a9ebaa99ed70bba2d91c096c76157047..ccd6be01098263c07f228bf7ad0ef2baf5bbbe23 100644 --- a/tests/script/general/compute/leastsquare.sim +++ b/tests/script/general/compute/leastsquare.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/max.sim b/tests/script/general/compute/max.sim index f8692c467f6aae178bd786bc0542d4cb5ccad48c..d7f80bfef04d6e59e5bfe0eb08e23992c50895ba 100644 --- a/tests/script/general/compute/max.sim +++ b/tests/script/general/compute/max.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/min.sim b/tests/script/general/compute/min.sim index 5a3f4351d01f192ffe8aaa3b62789cdfc9758cd2..3c123ca967cf5eaa00461ded051bded692c97919 100644 --- a/tests/script/general/compute/min.sim +++ b/tests/script/general/compute/min.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/compute/null.sim b/tests/script/general/compute/null.sim index 813d212636189ae18f4c8772da1212907db51bd1..784f9ba094f5746559a88bf1b129b4156c740ee5 100644 --- a/tests/script/general/compute/null.sim +++ b/tests/script/general/compute/null.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/percentile.sim b/tests/script/general/compute/percentile.sim index 2b30d4689c7225c40f7f7a84fbe435d4cdde4611..8a4086dd2402a6f4004f9bfe9390b97b20ca2518 100644 --- a/tests/script/general/compute/percentile.sim +++ b/tests/script/general/compute/percentile.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/stddev.sim b/tests/script/general/compute/stddev.sim index b39caea7a29d75b04c4c77b6b857bf60505de173..53a1b9bc01b689ff31fac7c2c6b8cb16e6b4b4fa 100644 --- a/tests/script/general/compute/stddev.sim +++ b/tests/script/general/compute/stddev.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/sum.sim b/tests/script/general/compute/sum.sim index e298eabf44fe1f332a087986b0170b568dbd9a53..4e4e75bfe47a9a536621676b286d8f653af61c97 100644 --- a/tests/script/general/compute/sum.sim +++ b/tests/script/general/compute/sum.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/compute/top.sim b/tests/script/general/compute/top.sim index d36f599b71b810afb54b14388633ce1a3e74001a..54d7699f27bd98e2699d93236c3d6bd563659303 100644 --- a/tests/script/general/compute/top.sim +++ b/tests/script/general/compute/top.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/db/backup/keep.sim b/tests/script/general/db/backup/keep.sim index c00665743c7f241c3be1421c72264cd8691de406..671d77de8c99c19929f4135b1320746af9b67265 100644 --- a/tests/script/general/db/backup/keep.sim +++ b/tests/script/general/db/backup/keep.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/basic.sim b/tests/script/general/db/basic.sim index a3bd1ae505d733153849e97b7061328acb15f442..9d56e1c5fb99acc39d2e953d1d3600bfcb6d5d4e 100644 --- a/tests/script/general/db/basic.sim +++ b/tests/script/general/db/basic.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c tables -v 1000 diff --git a/tests/script/general/db/basic1.sim b/tests/script/general/db/basic1.sim index 094c1a693012607714cb655e1b0f729666a53634..1fa6678ef84849d1eff27caa33c52245cf1dac30 100644 --- a/tests/script/general/db/basic1.sim +++ b/tests/script/general/db/basic1.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic2.sim b/tests/script/general/db/basic2.sim index a1e45337076823c6739851976f8a1dea70a180f9..945481d9bf964d52373409ae102f980bfe12bdb7 100644 --- a/tests/script/general/db/basic2.sim +++ b/tests/script/general/db/basic2.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic3.sim b/tests/script/general/db/basic3.sim index 60ff4b74c73fb5f47022e442819a68b6f130a41e..00e3e9d106934fa6f6d61ba73d4033507844520c 100644 --- a/tests/script/general/db/basic3.sim +++ b/tests/script/general/db/basic3.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic4.sim b/tests/script/general/db/basic4.sim index deac9d47b4a4864e10c376ed46098cae3e7f981d..9f8d463a7d8c65556a79e09b000eb5f2b8cb0f81 100644 --- a/tests/script/general/db/basic4.sim +++ b/tests/script/general/db/basic4.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/basic5.sim b/tests/script/general/db/basic5.sim index 55a42899ec554576495026ff4b912f930fbaa2ba..09ace39bf438c64883e2dbfa04ab212dd5a6b9a0 100644 --- a/tests/script/general/db/basic5.sim +++ b/tests/script/general/db/basic5.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/db/delete_reuse1.sim b/tests/script/general/db/delete_reuse1.sim index 55ed7a1f5cc62f992c46ea15e10c53e315ffd44a..6e21aabb3c62c9d6b8e0e7012403d0337723d376 100644 --- a/tests/script/general/db/delete_reuse1.sim +++ b/tests/script/general/db/delete_reuse1.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim index 3014bd4d2004ec836afffcaf47d56baf1f8bf795..95aa3f952600c715955694e32e99286741e303c8 100644 --- a/tests/script/general/db/delete_reuse2.sim +++ b/tests/script/general/db/delete_reuse2.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/general/db/delete_reusevnode.sim index b8a268d5bb6cca86a09c373663aaf2727c91ecae..2204e7434f65ae08bdcbd0314fde1ee305da85c1 100644 --- a/tests/script/general/db/delete_reusevnode.sim +++ b/tests/script/general/db/delete_reusevnode.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 @@ -45,8 +45,8 @@ endi system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim index f261b3d1e25769ca42ddfb37e8092562418aea44..dcf74a287da9ea693dd9c78131aaee85dec17f0f 100644 --- a/tests/script/general/db/delete_reusevnode2.sim +++ b/tests/script/general/db/delete_reusevnode2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/db/delete_writing1.sim b/tests/script/general/db/delete_writing1.sim index e06371266f3fcaff9c41872661fcd04e066a5efd..a4be57782e986a98a289ed5ae491b4484653a93c 100644 --- a/tests/script/general/db/delete_writing1.sim +++ b/tests/script/general/db/delete_writing1.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/general/db/delete_writing2.sim index 751cc26b2f71d12318f814353edc016a3aa86498..75603dcdd8b3b029714735707c7616758c40de3e 100644 --- a/tests/script/general/db/delete_writing2.sim +++ b/tests/script/general/db/delete_writing2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/general/db/len.sim b/tests/script/general/db/len.sim index 5e4a891dc243b9d57cda9b67f0055ceade2781d7..1cee902c1aa58cf481de608328d511348c547ee2 100644 --- a/tests/script/general/db/len.sim +++ b/tests/script/general/db/len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 diff --git a/tests/script/general/db/repeat.sim b/tests/script/general/db/repeat.sim index e008d95377004155b5a92ab672f9a67d17be2263..7afa42f0c4cea4fdbf51a8206391cf3e3141d582 100644 --- a/tests/script/general/db/repeat.sim +++ b/tests/script/general/db/repeat.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c tables -v 4 diff --git a/tests/script/general/db/tables.sim b/tests/script/general/db/tables.sim index aed8621116693dbe4e562cd08218c9ce750d17b8..afa11d6542bee705e6a9465431e765fdbcc1d695 100644 --- a/tests/script/general/db/tables.sim +++ b/tests/script/general/db/tables.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000 diff --git a/tests/script/general/field/2.sim b/tests/script/general/field/2.sim index c2d9d78085ec7c1195f35c3dfb264db63ff746a5..d5a002932e5a4a7114abc7a9325c2932cec62810 100644 --- a/tests/script/general/field/2.sim +++ b/tests/script/general/field/2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/3.sim b/tests/script/general/field/3.sim index 13f4c14f7b87660e2fdf8f21e269c93ca914f269..ed4df854ad84150c926c92864656fc53dc8b48dc 100644 --- a/tests/script/general/field/3.sim +++ b/tests/script/general/field/3.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/4.sim b/tests/script/general/field/4.sim index aa8fb822a455d7d8d751f993366e9388a2051bdb..465df43f04f625ec092da59ca8ca0fca41a52754 100644 --- a/tests/script/general/field/4.sim +++ b/tests/script/general/field/4.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/5.sim b/tests/script/general/field/5.sim index 9fa08cb799f173fe97c6df741bd5dcef1e8b77ad..e1e3d9a54a2f0e91c8290ee938143d6e7e90d0c7 100644 --- a/tests/script/general/field/5.sim +++ b/tests/script/general/field/5.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/6.sim b/tests/script/general/field/6.sim index b2ced5b9dfd3251886765515654a257c425e82d2..72e4b5bf4cfcd7cbf72ed76fd577e9eb5c6c4172 100644 --- a/tests/script/general/field/6.sim +++ b/tests/script/general/field/6.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/bigint.sim b/tests/script/general/field/bigint.sim index 2093f55de5f6be252093a84486ae5c9884cbe423..2adde6cd3dc902c08019327c13851a260a97e5ad 100644 --- a/tests/script/general/field/bigint.sim +++ b/tests/script/general/field/bigint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/binary.sim b/tests/script/general/field/binary.sim index a49af37806bb5eb0a59957cca64da035190ec71d..1e1a3682b194ed141a2e8267c37018d99a3b3958 100644 --- a/tests/script/general/field/binary.sim +++ b/tests/script/general/field/binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/bool.sim b/tests/script/general/field/bool.sim index aa70dbd23edbf41d8cc06a0506c721e46bf3f0c8..41770a399da1a73b293067c90b84277c5575f10e 100644 --- a/tests/script/general/field/bool.sim +++ b/tests/script/general/field/bool.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/double.sim b/tests/script/general/field/double.sim index daca74fcdefc39a2b25a126b0d5910f6be651eb1..bf3aa923fd27c32e068f87813bcd70500f7e65a7 100644 --- a/tests/script/general/field/double.sim +++ b/tests/script/general/field/double.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/float.sim b/tests/script/general/field/float.sim index 8bdebd6714d8481c33889ef38eea60fe8f555c9d..8e8c3740a870c6588a2cfd8edb549c8ae3c4514a 100644 --- a/tests/script/general/field/float.sim +++ b/tests/script/general/field/float.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/int.sim b/tests/script/general/field/int.sim index a3d4c901ebc98b5ddccc89ab7ae0e8e1e54cdca5..a4778279a1104d082c9312938ce007c540aac169 100644 --- a/tests/script/general/field/int.sim +++ b/tests/script/general/field/int.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/single.sim b/tests/script/general/field/single.sim index ad844da95de3aa937998afd355b08c2c26545b39..17492123ed4e9e3b4da72775824f6adcd75892e0 100644 --- a/tests/script/general/field/single.sim +++ b/tests/script/general/field/single.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/smallint.sim b/tests/script/general/field/smallint.sim index 432d766ac271468781c3a68aa33e3922aeaad88e..7b6ea2ce79fb8198395bc08a65b0c502f8cae36e 100644 --- a/tests/script/general/field/smallint.sim +++ b/tests/script/general/field/smallint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/field/tinyint.sim b/tests/script/general/field/tinyint.sim index 9b143e061f523a8713284517894d66934c7846ca..fe6e14f04a631fd57227f6eb3b8fc2ebee6bd765 100644 --- a/tests/script/general/field/tinyint.sim +++ b/tests/script/general/field/tinyint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/grafana.sim b/tests/script/general/http/grafana.sim index 818114f9d77b577a1695b00fd45f138952278a52..4f83accf2d99f24f884afd7de994dca13485c497 100644 --- a/tests/script/general/http/grafana.sim +++ b/tests/script/general/http/grafana.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 diff --git a/tests/script/general/http/grafana_bug.sim b/tests/script/general/http/grafana_bug.sim index 6f0e687fdaf0916c4130984fbde7198d557ff07a..ac6de5cb3111b33ae648b3257314856e17d9ba9e 100644 --- a/tests/script/general/http/grafana_bug.sim +++ b/tests/script/general/http/grafana_bug.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 2000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 diff --git a/tests/script/general/http/prepare.sim b/tests/script/general/http/prepare.sim index dcbaa7ef81ea2ac8cc75a6276afc8fefb297389c..11834e1223ce67d20321f6e660a790facc5fca3b 100644 --- a/tests/script/general/http/prepare.sim +++ b/tests/script/general/http/prepare.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful.sim b/tests/script/general/http/restful.sim index 50f0223804ac0ee07ef224facd01d0de50452aa8..7cc48bcb7ab6d33d1b84fbb001cd695d72a6102c 100644 --- a/tests/script/general/http/restful.sim +++ b/tests/script/general/http/restful.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim index b42f440068a096491396d4ce706783c0b51f0273..27f2a0625300528ce8eead64775e686be579e5a3 100644 --- a/tests/script/general/http/restful_full.sim +++ b/tests/script/general/http/restful_full.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh #sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful_insert.sim b/tests/script/general/http/restful_insert.sim index e131e3e53e84adb9cbb4ae62c1f5dea44ac873b1..5a032b0dbe7e784880982dd09791d07050a38b9e 100644 --- a/tests/script/general/http/restful_insert.sim +++ b/tests/script/general/http/restful_insert.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/restful_limit.sim b/tests/script/general/http/restful_limit.sim index 75d83b61b339ccb37292fbaffaf2b10b9d2361d8..190d63f4dbcfb44d24ef8f7ff563391c9b3fba80 100644 --- a/tests/script/general/http/restful_limit.sim +++ b/tests/script/general/http/restful_limit.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/http/telegraf.sim b/tests/script/general/http/telegraf.sim index b782a9b9bf076da1fdcf3af8e9682b980e852337..16bea1ac4b9f3befa86fd685b35e1ffa052f72f0 100644 --- a/tests/script/general/http/telegraf.sim +++ b/tests/script/general/http/telegraf.sim @@ -2,8 +2,8 @@ system sh/stop_dnodes.sh sleep 5000 -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1 system sh/cfg.sh -n dnode1 -c telegrafUseFieldNum -v 0 diff --git a/tests/script/general/import/basic.sim b/tests/script/general/import/basic.sim index 018d9ea7f7e21522eb23737adcc83d55ceac05dc..50370147280789d5edda379dd541c186a4b08d8d 100644 --- a/tests/script/general/import/basic.sim +++ b/tests/script/general/import/basic.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim index 974d9e394f4685b9f9e95ca27279b5a41d1354ae..2197c1d39de4a64f27adce0349d2ae8bcc21f0c7 100644 --- a/tests/script/general/import/commit.sim +++ b/tests/script/general/import/commit.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/import/large.sim b/tests/script/general/import/large.sim index 9fa8f662996d49bdef120b9755d2771c8a2e80a2..77a47a10497bb236dc0960f3b54ec9add8d16fd7 100644 --- a/tests/script/general/import/large.sim +++ b/tests/script/general/import/large.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim index 62fb5e78d4e8c308a523e00db3d8e61f8624bac9..193082097c7bab7c6636d693c2184ca606508e2d 100644 --- a/tests/script/general/import/replica1.sim +++ b/tests/script/general/import/replica1.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/insert/basic.sim b/tests/script/general/insert/basic.sim index 3b18c7e23ac33f9324ebc505cc7226cf5ac71ee0..9136f1e66f55b5efb2083dbde672dc30d1cf77e1 100644 --- a/tests/script/general/insert/basic.sim +++ b/tests/script/general/insert/basic.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim index ef183bb2f04e4080fd379c8be98119501688b9df..89aad812298070a84edba43f20f0ebd71e54478b 100644 --- a/tests/script/general/insert/insert_drop.sim +++ b/tests/script/general/insert/insert_drop.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block1_file.sim b/tests/script/general/insert/query_block1_file.sim index dff250ba8b0c4ee08895ba1fc72ad360885791cc..d13fb9841d93a755dc4c4034d01f9bdefbc88ea8 100644 --- a/tests/script/general/insert/query_block1_file.sim +++ b/tests/script/general/insert/query_block1_file.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block1_memory.sim b/tests/script/general/insert/query_block1_memory.sim index b94eb4ecd1aace131524e1410564fae2bd9f854a..c20613e192ced4e12b3521017490570cf315bced 100644 --- a/tests/script/general/insert/query_block1_memory.sim +++ b/tests/script/general/insert/query_block1_memory.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block2_file.sim b/tests/script/general/insert/query_block2_file.sim index 3ce1e51e02431c5b11e03041b410a234594e0704..18a3f407bbbf9ea98034b50864a2b51a70e1a358 100644 --- a/tests/script/general/insert/query_block2_file.sim +++ b/tests/script/general/insert/query_block2_file.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_block2_memory.sim b/tests/script/general/insert/query_block2_memory.sim index 6546d89507b4cf86d13daf7976fb5957bc8acc04..409e84269d04ef8bde9472eb54107951c0651c92 100644 --- a/tests/script/general/insert/query_block2_memory.sim +++ b/tests/script/general/insert/query_block2_memory.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_file_memory.sim b/tests/script/general/insert/query_file_memory.sim index d968f1b1f836645239674386c8f19aec2d8233ef..b6e1bf4e55b07bff4bf4965a7a201978f9d33c50 100644 --- a/tests/script/general/insert/query_file_memory.sim +++ b/tests/script/general/insert/query_file_memory.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/query_multi_file.sim b/tests/script/general/insert/query_multi_file.sim index 802efe2ac18740f8d5f1ce8d89477931641c3d7c..901b6409fce2ab4c6f12507bc0fd8ce69118d51a 100644 --- a/tests/script/general/insert/query_multi_file.sim +++ b/tests/script/general/insert/query_multi_file.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/insert/tcp.sim b/tests/script/general/insert/tcp.sim index ecb6dc43d52d3e1e3b0cbbcf1bee62f03100c3c2..c2782ac1e15917c41b055e6a167873e423e4d877 100644 --- a/tests/script/general/insert/tcp.sim +++ b/tests/script/general/insert/tcp.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/metrics/disk.sim b/tests/script/general/metrics/disk.sim index a960fd96fa3983400eb3abb67279d1d9c4e358d3..421b5f7c6a663ddc27906c694cdb9c3760f3ee8a 100644 --- a/tests/script/general/metrics/disk.sim +++ b/tests/script/general/metrics/disk.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/metrics/metrics.sim b/tests/script/general/metrics/metrics.sim index 0aabadd0e4a6f1960fbaec94176b08173e8be846..f0864034de66d08a5eacfd34dee8a13f2c8c4a03 100644 --- a/tests/script/general/metrics/metrics.sim +++ b/tests/script/general/metrics/metrics.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/metrics/values.sim b/tests/script/general/metrics/values.sim index e91a9fee397a562f20a443e38f4e17cd37a04d1a..aa5aecd6acd53952e87e7058f7e650750346aa02 100644 --- a/tests/script/general/metrics/values.sim +++ b/tests/script/general/metrics/values.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/metrics/vnode3.sim b/tests/script/general/metrics/vnode3.sim index 3a5c58363ea6595e25a42285e3236f10903868f7..a2642ac7e87bcf7ca42afeef817a1e7ab4fdafa4 100644 --- a/tests/script/general/metrics/vnode3.sim +++ b/tests/script/general/metrics/vnode3.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim index 87e4089d3502cf303babac27e36ef2ae58b8c03d..07b7f71fa44ae270f4a2a3688a082f9c3ef8b001 100644 --- a/tests/script/general/parser/alter.sim +++ b/tests/script/general/parser/alter.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/alter1.sim b/tests/script/general/parser/alter1.sim index 695003c702f251c919f1f242d5619e5641121778..058977f7842e4015b783a64d2084f0d001a5ea7b 100644 --- a/tests/script/general/parser/alter1.sim +++ b/tests/script/general/parser/alter1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/general/parser/alter_stable.sim index 6ef9b812e790151f0c0426481c3e8fd12b991e7f..c0614ec00af35a1771fcf3d43fefc4deef76cb10 100644 --- a/tests/script/general/parser/alter_stable.sim +++ b/tests/script/general/parser/alter_stable.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim index ed3131d2ac0f6f50763773912effce9c095d9a52..f9db56d15c2b9557a4c67702703fbf2f80024ff7 100644 --- a/tests/script/general/parser/auto_create_tb.sim +++ b/tests/script/general/parser/auto_create_tb.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim index 3489aba9fd5e3405bc777fa974ff074d223f7f61..bb27c3e440fa75adb0a5fed17e2f81299e24fc21 100644 --- a/tests/script/general/parser/auto_create_tb_drop_tb.sim +++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim index 6ab86c5ba30269559f04df7404591359b6296046..7342a96f4f7b68f93001c460ca72258cfddef48a 100644 --- a/tests/script/general/parser/binary_escapeCharacter.sim +++ b/tests/script/general/parser/binary_escapeCharacter.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/bug.sim b/tests/script/general/parser/bug.sim index cac74671f328c5b19bc1b2c61854a9077c2442e8..7e7d7e536e07cec47ddcc8425ebc1a3ce4e672e1 100644 --- a/tests/script/general/parser/bug.sim +++ b/tests/script/general/parser/bug.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c dDebugFlag -v 135 diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim index 5b478d7fc227c1a4bb8ef430a533de6e22a659fe..b4ffeadc2316081109619b7f7d4c2de4d290132f 100644 --- a/tests/script/general/parser/col_arithmetic_operation.sim +++ b/tests/script/general/parser/col_arithmetic_operation.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/general/parser/columnValue.sim index 854bb219e507a2f81ab84324d417a1e40c87949e..ead480cad890e2b6bb33aed75b1b6e5108db8ad9 100644 --- a/tests/script/general/parser/columnValue.sim +++ b/tests/script/general/parser/columnValue.sim @@ -1,7 +1,7 @@ #### system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim index 61faad18647d8dd9c6f9d86116d9c7df4f85f019..eab9497b0b8132e87313e0d9e29fc411c54b98ed 100644 --- a/tests/script/general/parser/commit.sim +++ b/tests/script/general/parser/commit.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim index 9bfeef7355c340c151516830d555ad3416a95511..b272ef1ddb6154195b248257d3586a51202bf591 100644 --- a/tests/script/general/parser/create_db.sim +++ b/tests/script/general/parser/create_db.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim index 486a1e3fc80be06e1d9fac9952e800ddeec7ef68..83dd09eb8f60532d655191f5399a917eda81f1a1 100644 --- a/tests/script/general/parser/create_mt.sim +++ b/tests/script/general/parser/create_mt.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim index 489780130a068675166cd4ff37a5b054dc7b54fa..5e3007824aac3587946fa711edba94f257fceb0a 100644 --- a/tests/script/general/parser/create_tb.sim +++ b/tests/script/general/parser/create_tb.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/general/parser/dbtbnameValidate.sim index 0ec5f3c9aa6545f10ca17058693642169a4dec7a..c4a789da79310f0c0ada15c29200e4065ff3a31a 100644 --- a/tests/script/general/parser/dbtbnameValidate.sim +++ b/tests/script/general/parser/dbtbnameValidate.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 1000 diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim index 89e35e1a3854bc897e5f8dfae5cb19b93876c808..33286ecfcb75db293895fca39f9e5ac66d41cbd4 100644 --- a/tests/script/general/parser/fill.sim +++ b/tests/script/general/parser/fill.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim index 0740ab64fab1bcf2c793fd9ccaf8107015e0a038..8fecaeb4c4c48374a388d47539c9d3022744975a 100644 --- a/tests/script/general/parser/fill_stb.sim +++ b/tests/script/general/parser/fill_stb.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim index dd125c60f98ed7fc1955170d51edab0a4a54207a..b5133ed9a1eb6aa05bc3961fe150b0c7f4fa47a9 100644 --- a/tests/script/general/parser/first_last.sim +++ b/tests/script/general/parser/first_last.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim index ca83fb19b296f4bb614ea647c5a3003d5fa480b0..4d367999b2b649a92a717d02d6c649784084356c 100644 --- a/tests/script/general/parser/groupby.sim +++ b/tests/script/general/parser/groupby.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 1000 diff --git a/tests/script/general/parser/import.sim b/tests/script/general/parser/import.sim index d3b96cbf89ea4b43c8e71a3b31bcf8e9e0a3191c..465f077fecd90f68ccdf0a33edc13cadc714141b 100644 --- a/tests/script/general/parser/import.sim +++ b/tests/script/general/parser/import.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim index a9935aa54e5e8b0ea49e6f2e02e480e2e4b08c5f..a1bc057aef700e7ea4a8475896299b1165a62d4d 100644 --- a/tests/script/general/parser/import_commit1.sim +++ b/tests/script/general/parser/import_commit1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim index d5edb89f8ecbc05048628bc270fde5e6c6c251b1..c02905a2d599770e6a60c20f6667de65ec634c9a 100644 --- a/tests/script/general/parser/import_commit2.sim +++ b/tests/script/general/parser/import_commit2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim index be915b5406aaaf42d86b4218df984e3eb3efb621..c37ecd9a17f4d6cd7e7acb91dd5b677f7fa421b7 100644 --- a/tests/script/general/parser/import_commit3.sim +++ b/tests/script/general/parser/import_commit3.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 1 system sh/cfg.sh -n dnode1 -c commitTime -v 30 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/import_file.sim b/tests/script/general/parser/import_file.sim index 2566e956b3e7b7df294a2a1aaf5ad0dfa2762256..f0fef295c4a1366c673ad887dedbb2efd7ede562 100644 --- a/tests/script/general/parser/import_file.sim +++ b/tests/script/general/parser/import_file.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 2000 diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/general/parser/insert_multiTbl.sim index 4e4b8b3e1378d4b68dc60fb524739a25041646a5..503ab7e1da172aafe7421d98996d6ccafd992d47 100644 --- a/tests/script/general/parser/insert_multiTbl.sim +++ b/tests/script/general/parser/insert_multiTbl.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 2000 diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim index f7e2980707e279ed31778a8dbbaf78c6258b8fec..c69228d6625f6ad13b5c23cfd6be81778825166d 100644 --- a/tests/script/general/parser/insert_tb.sim +++ b/tests/script/general/parser/insert_tb.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim index 2d3bc2ac87579047a748b0a5afe52fc9bd303307..78369ec84c50648b995727bada101117db4bb97b 100644 --- a/tests/script/general/parser/interp.sim +++ b/tests/script/general/parser/interp.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim index b9b35e0cd3de09c770f0d3d5368f3797f7b0c498..b90579d8d83396437da451accdcaaa4931f280ee 100644 --- a/tests/script/general/parser/join.sim +++ b/tests/script/general/parser/join.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c debugFlag -v 135 system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135 diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim index 46f38f9ce065825e1b043fa899c322567fe80609..983b7fad45354e4ff505f0b48b8c8234d4497e87 100644 --- a/tests/script/general/parser/join_multivnode.sim +++ b/tests/script/general/parser/join_multivnode.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim index c76c71b62e8008fdfd6c777eecab607f5ff9abe9..50317c7abc84ce11a6eef4c04549e2606fd4d367 100644 --- a/tests/script/general/parser/lastrow.sim +++ b/tests/script/general/parser/lastrow.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim index 4ca348dbd6449dea47e84aec17cbf03c51d5819a..16b2a2878c624c7a56869e14eafbc87c0854fe8b 100644 --- a/tests/script/general/parser/limit.sim +++ b/tests/script/general/parser/limit.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim index bdb5b90983d7650039d4c655fcf67e1ee8233b3c..9856365f8e56e23285f2ee5ad2882f50195c791a 100644 --- a/tests/script/general/parser/limit1.sim +++ b/tests/script/general/parser/limit1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim index 6e108226a5cc1d17fb456840750703f01283096b..b89b7892d442fd8c655c1478a869401fe9251c66 100644 --- a/tests/script/general/parser/limit1_tblocks100.sim +++ b/tests/script/general/parser/limit1_tblocks100.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim index 4374ac9be2a5f44f9845749decb9baa676ccd400..71f1c6f2e817d378ec7d29da405c9473eb9ea2ab 100644 --- a/tests/script/general/parser/limit2.sim +++ b/tests/script/general/parser/limit2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim index 061d7225b1bf35eb27ae2831c653d59752ff87fc..a91103270dcd23eaef3a96906b7a294c0d1419d1 100644 --- a/tests/script/general/parser/limit2_tblocks100.sim +++ b/tests/script/general/parser/limit2_tblocks100.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim index 03c3a77a89d49963f819509acf84429f59144bf1..29f6d2a7425982739299944b978c35002819b519 100644 --- a/tests/script/general/parser/mixed_blocks.sim +++ b/tests/script/general/parser/mixed_blocks.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/nchar.sim b/tests/script/general/parser/nchar.sim index b6c3a3c9bb559dab150ac910ca149c08089b7b33..51853825c1d82aea4cece67b102d1af53312c2d1 100644 --- a/tests/script/general/parser/nchar.sim +++ b/tests/script/general/parser/nchar.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim index eeb94708d9558b2df5ea03e1620f5bfe1e746336..225c7b6cb7ee910173cf2cc313ec3fe716d3f3f7 100644 --- a/tests/script/general/parser/null_char.sim +++ b/tests/script/general/parser/null_char.sim @@ -1,7 +1,7 @@ #### TBASE-679 system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3 diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim index 2f18e3cf347cae11ca43371d57170af18370b062..21c2151b7771c7edd3cf68a59b16f5a2aab936fe 100644 --- a/tests/script/general/parser/projection_limit_offset.sim +++ b/tests/script/general/parser/projection_limit_offset.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim index 3065c7eca02be1ae504d1b476f7eaee23db4e22f..dd06d2652126b4ac19d7cd311d4a159f0266ba7e 100644 --- a/tests/script/general/parser/selectResNum.sim +++ b/tests/script/general/parser/selectResNum.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim index 875036082d58c74fb47f51299c19fdf9e18543d6..67c727ef289746a107fee4315f57370eeeedeb68 100644 --- a/tests/script/general/parser/select_across_vnodes.sim +++ b/tests/script/general/parser/select_across_vnodes.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 5 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim index a60571b7d1b70ad5cdbc92c8bace08046ed0c706..9450d41720ceb8c83959b9f39f8e42dac3ba565f 100644 --- a/tests/script/general/parser/select_from_cache_disk.sim +++ b/tests/script/general/parser/select_from_cache_disk.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim index 8558323ebafbcd2d2f94512dc9e85a4809b80a73..92e30bc9149180996cb242745f885ca47669b89b 100644 --- a/tests/script/general/parser/select_with_tags.sim +++ b/tests/script/general/parser/select_with_tags.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 1000 diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim index 80766432476f655262f4bf9a854761276277f8a7..62fef458466370fc0d41ca4cc9ad534307e8a371 100644 --- a/tests/script/general/parser/set_tag_vals.sim +++ b/tests/script/general/parser/set_tag_vals.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim index bf94c713470378f62bc194d69f5204bf5d2f116b..1a159d97fdb639da51e57d439c83d1811e46358c 100644 --- a/tests/script/general/parser/single_row_in_tb.sim +++ b/tests/script/general/parser/single_row_in_tb.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim index ae83d92e2224508c56d8550ab57f2d9d0c2ad0c6..61abf1eb2a06325686270ecbee65601b6d4d1c29 100644 --- a/tests/script/general/parser/slimit.sim +++ b/tests/script/general/parser/slimit.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim index 40be5c1b91c9dfed1ed4c0ad273fea3dc4cd8db6..d034d5bf1719cb978e40f19ab45541583aeac7f4 100644 --- a/tests/script/general/parser/slimit1.sim +++ b/tests/script/general/parser/slimit1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim index 6091fa89b423af9f97049ed332e3f50d78bad793..6579549287b2c01fc883e6ad7701a9bd9a81ed96 100644 --- a/tests/script/general/parser/slimit_alter_tags.sim +++ b/tests/script/general/parser/slimit_alter_tags.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10 diff --git a/tests/script/general/parser/stream.sim b/tests/script/general/parser/stream.sim index 33a7d2ac6e0f86d406939ec12e58c089e17a160b..b3334d970ecd46a881b9de21e10caca1ba1db2ba 100644 --- a/tests/script/general/parser/stream.sim +++ b/tests/script/general/parser/stream.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 5 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 5 diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim index d0f6cbace310d85ad09f2af10eb493417d4fccde..aa3595eaf64a28edbacbe9fe6025e1fd3aed1c4f 100644 --- a/tests/script/general/parser/stream_on_sys.sim +++ b/tests/script/general/parser/stream_on_sys.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c monitor -v 1 system sh/cfg.sh -n dnode1 -c monitorInterval -v 1 diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/general/parser/tags_dynamically_specifiy.sim index b34ea90413a113daeb0aa1470a5c97a52badface..ca8d335742175478760cb94ea6abad65b0cc6a22 100644 --- a/tests/script/general/parser/tags_dynamically_specifiy.sim +++ b/tests/script/general/parser/tags_dynamically_specifiy.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/general/parser/tags_filter.sim index 29b295b6cd53bf1eeb35e32606cb977e4bbb2207..bc6c6c52f073a5c7f0cd6648cf470704d1d9250d 100644 --- a/tests/script/general/parser/tags_filter.sim +++ b/tests/script/general/parser/tags_filter.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim index d3b16ea202d3e8b6152c5d0c55113d073ea21411..38551dd59e082c7cce5895b6954e5a407a93a902 100644 --- a/tests/script/general/parser/tbnameIn.sim +++ b/tests/script/general/parser/tbnameIn.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim index edc03fc4f03d0daf04d35aa2569b1d3cd1dd1f5e..8d407dd5cc6444ffc64f7675aef9826e34ed3ff4 100644 --- a/tests/script/general/parser/timestamp.sim +++ b/tests/script/general/parser/timestamp.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim index 397ce534770e4e41ad73866dca50dbc1f203cbe4..05237c392b9bb82d0946779f2a2cf9fdf7ea1e22 100644 --- a/tests/script/general/parser/where.sim +++ b/tests/script/general/parser/where.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/show/dnodes.sim b/tests/script/general/show/dnodes.sim index df78194365b091811c9472f5b31995a3c7e10194..0951c1a6c90b4d1e6379acb9d59b78a20dfd5fae 100644 --- a/tests/script/general/show/dnodes.sim +++ b/tests/script/general/show/dnodes.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/stream/metrics_1.sim b/tests/script/general/stream/metrics_1.sim index e61572d9f4e3dda61a6fb241aff4c1755b73d29f..2e8d02bf21413abd2a18dc23dc6ec76a54681dd4 100644 --- a/tests/script/general/stream/metrics_1.sim +++ b/tests/script/general/stream/metrics_1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim index 9077d48f45a08d95f74cff38d641a92dba753491..7ca74dc102e01dfd7cf7f3589e693b99950fdef6 100644 --- a/tests/script/general/stream/metrics_del.sim +++ b/tests/script/general/stream/metrics_del.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100 diff --git a/tests/script/general/stream/metrics_n.sim b/tests/script/general/stream/metrics_n.sim index c3b20f86165c2a63f1a663954dbfb4bb828031fa..31f9fc64ffe9c54489522a8fac7b8a2cf1beb05d 100644 --- a/tests/script/general/stream/metrics_n.sim +++ b/tests/script/general/stream/metrics_n.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/metrics_replica1_vnoden.sim b/tests/script/general/stream/metrics_replica1_vnoden.sim index 5129dc2f02ef3133a60519630a7f09abb60a2dd7..76ffd99d89ada975c068d08194c85342b1a9c25e 100644 --- a/tests/script/general/stream/metrics_replica1_vnoden.sim +++ b/tests/script/general/stream/metrics_replica1_vnoden.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/stream/stream_1.sim b/tests/script/general/stream/stream_1.sim index 0178ef2ac37c6272868937c192a9ebfb0185f216..bb2d4a05a5be8a67448dee358c8721ac733f3c75 100644 --- a/tests/script/general/stream/stream_1.sim +++ b/tests/script/general/stream/stream_1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/stream_2.sim b/tests/script/general/stream/stream_2.sim index a2af8f8548df790f2e11647d836d1cdf43e7c5d3..d0fa60ff9096b724f2e97b7555a0f57a47cdad2b 100644 --- a/tests/script/general/stream/stream_2.sim +++ b/tests/script/general/stream/stream_2.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/stream_3.sim b/tests/script/general/stream/stream_3.sim index 6758d74aba8cbac8c61d07496278d10b29f53a72..3e7d574cd4538b5a8fa77207f3693e67053fbc65 100644 --- a/tests/script/general/stream/stream_3.sim +++ b/tests/script/general/stream/stream_3.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start @@ -107,7 +107,7 @@ endi print =============== step7 system sh/exec.sh -n dnode1 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100 diff --git a/tests/script/general/stream/stream_restart.sim b/tests/script/general/stream/stream_restart.sim index 6d9324b69c46d2660e902847f60c4cce0ad5fb7b..f37fbf471d95f63bf41498a5c8a25b82b51a7e43 100644 --- a/tests/script/general/stream/stream_restart.sim +++ b/tests/script/general/stream/stream_restart.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/table_1.sim b/tests/script/general/stream/table_1.sim index 08aa4912e34db45a4453ee7b06ec5bea8b51787d..be45a98f4904165fb3d7017fefd3a98b9c991cea 100644 --- a/tests/script/general/stream/table_1.sim +++ b/tests/script/general/stream/table_1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim index 509c72e4c8e654f18d4a3f059ea7fdb389da2b45..a2db5b250dcea8c61b77e749c70bab30bfc038ce 100644 --- a/tests/script/general/stream/table_del.sim +++ b/tests/script/general/stream/table_del.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100 diff --git a/tests/script/general/stream/table_n.sim b/tests/script/general/stream/table_n.sim index 3eeadd0aff29abb8404aad1c876ed3c7836a6c54..49e8e723da9548d53a97283653a20a99766c7797 100644 --- a/tests/script/general/stream/table_n.sim +++ b/tests/script/general/stream/table_n.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim index f9db9fd9f4b37fca30763813ac7f40af74bb7d9f..1ed649a3fb4290cf6964f89faae3d0332d160ac4 100644 --- a/tests/script/general/stream/table_replica1_vnoden.sim +++ b/tests/script/general/stream/table_replica1_vnoden.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4 diff --git a/tests/script/general/table/autocreate.sim b/tests/script/general/table/autocreate.sim index 9aa28b2cec2de80c1e9df3d8655b02816b6dd095..eac153e3c21581192eef02fb1c9e9822549b508f 100644 --- a/tests/script/general/table/autocreate.sim +++ b/tests/script/general/table/autocreate.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/basic1.sim b/tests/script/general/table/basic1.sim index a8dfb0f21a03067f3348810485e37e3c6552995d..0e425c95f9f7885ccd11af53d8def960f6f28ccf 100644 --- a/tests/script/general/table/basic1.sim +++ b/tests/script/general/table/basic1.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/basic2.sim b/tests/script/general/table/basic2.sim index 1f6d889429de482c820b0297010326b4a03155ee..40688403a86b536130794b0d70cd109d2cc5f694 100644 --- a/tests/script/general/table/basic2.sim +++ b/tests/script/general/table/basic2.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/basic3.sim b/tests/script/general/table/basic3.sim index 6558617384f7ef68b99ec10b9cf0e7e241c302d1..18c3f9b6251324d19dd3f21edcd7b29707ab1fa2 100644 --- a/tests/script/general/table/basic3.sim +++ b/tests/script/general/table/basic3.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/table/bigint.sim b/tests/script/general/table/bigint.sim index 667ce523cb74a7ce3ab79b305012676fd5b4be91..4145968fbd767b5ef7e6be3254824d440e110bf0 100644 --- a/tests/script/general/table/bigint.sim +++ b/tests/script/general/table/bigint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/binary.sim b/tests/script/general/table/binary.sim index bc91c48c195ed295eacf7140880d76dee09dc732..b0c5166d2021089ac21bf4319087f54c9ba14b2a 100644 --- a/tests/script/general/table/binary.sim +++ b/tests/script/general/table/binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/bool.sim b/tests/script/general/table/bool.sim index 1393315b4f7e3b6df0079192d22a691d7109bb8a..b55147b67e70e3243b4dc362458fdd19606de428 100644 --- a/tests/script/general/table/bool.sim +++ b/tests/script/general/table/bool.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column2.sim b/tests/script/general/table/column2.sim index 3d32ae454eb21a57a74d27fba76736d57d1453d6..4c27ae68ade9b5d09b34ca33a6faceddf573152f 100644 --- a/tests/script/general/table/column2.sim +++ b/tests/script/general/table/column2.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column_name.sim b/tests/script/general/table/column_name.sim index c49e58336d00805b3f78fc78ceada2273665b750..41a4179a41ea23f841e5baf8635adcd16ed75b96 100644 --- a/tests/script/general/table/column_name.sim +++ b/tests/script/general/table/column_name.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column_num.sim b/tests/script/general/table/column_num.sim index 5e124a1943b70658d58d591e958d72b9d7d425df..bf82b9fc058e9b2d71cdc6818411edea67d895b0 100644 --- a/tests/script/general/table/column_num.sim +++ b/tests/script/general/table/column_num.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/column_value.sim b/tests/script/general/table/column_value.sim index bb811b7ab88e156970018a7388a90d8eee75da5c..2a1636e5ca4196f88dce9c9a72ff3ce92c0e0cf1 100644 --- a/tests/script/general/table/column_value.sim +++ b/tests/script/general/table/column_value.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/date.sim b/tests/script/general/table/date.sim index 52242b638880b45bc721ad4aa85f4bb99e5f4380..f702a557504384ed0525522a9b3b185f7100b0ea 100644 --- a/tests/script/general/table/date.sim +++ b/tests/script/general/table/date.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/db.table.sim b/tests/script/general/table/db.table.sim index 242f778a1564043326a89a1df269e60500c70e29..653a73310f4c9391ae3ff60403fb73bae445bbde 100644 --- a/tests/script/general/table/db.table.sim +++ b/tests/script/general/table/db.table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/delete_reuse1.sim b/tests/script/general/table/delete_reuse1.sim index 1f47088c6f3d48a4b7dc68f127c4f24acc89f67c..1f42637088dda7772e4dd18f7eb282046e5491a9 100644 --- a/tests/script/general/table/delete_reuse1.sim +++ b/tests/script/general/table/delete_reuse1.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/table/delete_reuse2.sim b/tests/script/general/table/delete_reuse2.sim index acd69bc488dbb3963d5403499b671f3d897a5aa2..238eac975dc14afb28cca72c33431a4138437bf0 100644 --- a/tests/script/general/table/delete_reuse2.sim +++ b/tests/script/general/table/delete_reuse2.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/table/delete_writing.sim b/tests/script/general/table/delete_writing.sim index 769207b83c32991aac61c9e5dd51744ec3b819fe..b697c7f8419b1a37d06e5abc20344c7e33ad758d 100644 --- a/tests/script/general/table/delete_writing.sim +++ b/tests/script/general/table/delete_writing.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/general/table/describe.sim b/tests/script/general/table/describe.sim index 1905a0b0329bb0835b7c2ae13c40814f5c6481b3..fd9a8eda18729e1f27e655d6d323680a7dbc41e3 100644 --- a/tests/script/general/table/describe.sim +++ b/tests/script/general/table/describe.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/double.sim b/tests/script/general/table/double.sim index 2b34f5a1913dcdb334021792f354addf244a1cf3..36013be51d137bf12dab189a15244048871be392 100644 --- a/tests/script/general/table/double.sim +++ b/tests/script/general/table/double.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/float.sim b/tests/script/general/table/float.sim index 95666f677b12d58f76db6cf4fade8db9cb2e9a4c..195a2268b74ac0fec529102dfd7f95244d955226 100644 --- a/tests/script/general/table/float.sim +++ b/tests/script/general/table/float.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/int.sim b/tests/script/general/table/int.sim index 70a2ac767d4bad26f03b51174101397d5273a8db..0f8223896c1ae6699bcf139a7d9f482702caf7fe 100644 --- a/tests/script/general/table/int.sim +++ b/tests/script/general/table/int.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/limit.sim b/tests/script/general/table/limit.sim index 904a49a2fdb6dceda810167e4404c947f37d2f97..e01a209b610db32ebaceca4dd03d1bed193a6908 100644 --- a/tests/script/general/table/limit.sim +++ b/tests/script/general/table/limit.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 129 diff --git a/tests/script/general/table/smallint.sim b/tests/script/general/table/smallint.sim index 0547fbb1b6df0dd305a0598443c9804d9b3f4fb8..6a0fbd7fb5bc0111eb58af1bb56a860069dfe16c 100644 --- a/tests/script/general/table/smallint.sim +++ b/tests/script/general/table/smallint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/table.sim b/tests/script/general/table/table.sim index 2c8467b9a339cf4b66c35d2d2a9812b2e3d27fbd..468e60f1baa74c7ff3923acfb4101d3813f51177 100644 --- a/tests/script/general/table/table.sim +++ b/tests/script/general/table/table.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/table_len.sim b/tests/script/general/table/table_len.sim index 37c06c515c33a67ba19372af17ceea1edab881c4..e1ed254fe118fec725e928a229376d731c018fad 100644 --- a/tests/script/general/table/table_len.sim +++ b/tests/script/general/table/table_len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/tinyint.sim b/tests/script/general/table/tinyint.sim index 4e50b6dba214a066aa3726d8246ead9e97bba4b1..d22331c2a38a45735486a79807aea009a3e4a2ad 100644 --- a/tests/script/general/table/tinyint.sim +++ b/tests/script/general/table/tinyint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/table/vgroup.sim b/tests/script/general/table/vgroup.sim index d5198534bc3583f133b79bd5a6473f5d92a47ef8..cd5c44fb6062f3f93283816e22787caad748833b 100644 --- a/tests/script/general/table/vgroup.sim +++ b/tests/script/general/table/vgroup.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/3.sim b/tests/script/general/tag/3.sim index b972bdf975e9c5dabe369367d04c94a1518a2d7e..1cc2fa8cf78064032bd54de64f60e9d9e455c822 100644 --- a/tests/script/general/tag/3.sim +++ b/tests/script/general/tag/3.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/4.sim b/tests/script/general/tag/4.sim index d75f5478c1130d0e9cda86f3031a04422bdac102..02bb910888fdf62f55fd68d75b9f6ac9f7d9d0c7 100644 --- a/tests/script/general/tag/4.sim +++ b/tests/script/general/tag/4.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/5.sim b/tests/script/general/tag/5.sim index bf8cb9358a5374618d284e73f8be72525248b672..3231f738a746b9565ff15de3082bb866d4cf255a 100644 --- a/tests/script/general/tag/5.sim +++ b/tests/script/general/tag/5.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/6.sim b/tests/script/general/tag/6.sim index 3705ffc1109ce9c46a853c16b07c57580e745208..9c106a189c34b3dd71dc9a63eddf9e5de0f4c8f3 100644 --- a/tests/script/general/tag/6.sim +++ b/tests/script/general/tag/6.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/add.sim b/tests/script/general/tag/add.sim index b36bc0c6c3a1c5325a132980eaa60ba3bd0135cc..6c9456d57ac438467cb34d6164cec009288f3731 100644 --- a/tests/script/general/tag/add.sim +++ b/tests/script/general/tag/add.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bigint.sim b/tests/script/general/tag/bigint.sim index 5519f6759e7e10f485a7e7ba12ec9f7cb88ff84f..3522d91b93ef9753d69d08f0046423a38e929436 100644 --- a/tests/script/general/tag/bigint.sim +++ b/tests/script/general/tag/bigint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/binary.sim b/tests/script/general/tag/binary.sim index f5e779bfeeeaf5e185e2d5e7cbe07e2dfa8b7701..45aedf6db83fb87060db1ca2014611ba7a7f8325 100644 --- a/tests/script/general/tag/binary.sim +++ b/tests/script/general/tag/binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/binary_binary.sim b/tests/script/general/tag/binary_binary.sim index f2622bd03476f80452cf5c47fbd086f8b8257da9..fdb10d5877cdd9aefd9fc3dc80e5c0c2f45c6086 100644 --- a/tests/script/general/tag/binary_binary.sim +++ b/tests/script/general/tag/binary_binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bool.sim b/tests/script/general/tag/bool.sim index fb69a0ac6728a984ba432b7592755383a6e3bedf..da3da99b199e1902ca5b418bb4cb2ecb6461f234 100644 --- a/tests/script/general/tag/bool.sim +++ b/tests/script/general/tag/bool.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bool_binary.sim b/tests/script/general/tag/bool_binary.sim index 55542d7de7de0dedb1ededdd90c9943f101d4649..ddd5b3df94ec6c884e58d2622ff535db89dd8b3f 100644 --- a/tests/script/general/tag/bool_binary.sim +++ b/tests/script/general/tag/bool_binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/bool_int.sim b/tests/script/general/tag/bool_int.sim index 261bbfb3d82ad2084e8f6f2f0ac5ebf017ff5823..6f1a637965b172067200d75b57b03b40a8061c9e 100644 --- a/tests/script/general/tag/bool_int.sim +++ b/tests/script/general/tag/bool_int.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/change.sim b/tests/script/general/tag/change.sim index b77e5765d2443445486d7a4afb1e0e6f204a60c1..f0f4efb9c648bc064c80a18f1813cdc16d54b3cc 100644 --- a/tests/script/general/tag/change.sim +++ b/tests/script/general/tag/change.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/column.sim b/tests/script/general/tag/column.sim index a7f1b1c8c28c198568acce7b2ad6440e9c341a1b..4313f48e5f9a14dfe09936ed3b873a770b7bea12 100644 --- a/tests/script/general/tag/column.sim +++ b/tests/script/general/tag/column.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/commit.sim b/tests/script/general/tag/commit.sim index 84bb72271b7b9105922f28499bb0e2516b5947a5..94ea85781a9a53724d1a8d14194a725565f8760c 100644 --- a/tests/script/general/tag/commit.sim +++ b/tests/script/general/tag/commit.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/create.sim b/tests/script/general/tag/create.sim index 9742b1c8da38b1f644eb863127deb30ac8e7f72e..852eadfbccbaee5916de92da76b2b5e0f8c497e3 100644 --- a/tests/script/general/tag/create.sim +++ b/tests/script/general/tag/create.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/delete.sim b/tests/script/general/tag/delete.sim index 2a0e3ea58c9f98a9b0225b7d8679095186393a25..ae424ef58ce04504f9c0c933f0eb679a19a997f6 100644 --- a/tests/script/general/tag/delete.sim +++ b/tests/script/general/tag/delete.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/double.sim b/tests/script/general/tag/double.sim index 8c5831b74c53a88c464baf68c54924c3f58def66..d811325b10744f3eda2dd93e203fc4dce43c0ef5 100644 --- a/tests/script/general/tag/double.sim +++ b/tests/script/general/tag/double.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/filter.sim b/tests/script/general/tag/filter.sim index 6d8f9ff89372b098bdfb0d25b632b5209c205c02..b10e8a03727a7740e407881e0e22650ef8587118 100644 --- a/tests/script/general/tag/filter.sim +++ b/tests/script/general/tag/filter.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/tag/float.sim b/tests/script/general/tag/float.sim index 49fcf8029b59c93156646b281a453822ab140f39..537211fe1b3dd9142d0ad5314474ee1a5de87ae8 100644 --- a/tests/script/general/tag/float.sim +++ b/tests/script/general/tag/float.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/int.sim b/tests/script/general/tag/int.sim index d663dd6eb03972a1cad42b5b68ae3d04fc8f0070..ea635d9db64776fdbffaefc30c6a75dcd497fa13 100644 --- a/tests/script/general/tag/int.sim +++ b/tests/script/general/tag/int.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/int_binary.sim b/tests/script/general/tag/int_binary.sim index 29220eb92f48923e67b077b1429e184098c6cd93..166285f799c8dc353160e6050f569d545857d910 100644 --- a/tests/script/general/tag/int_binary.sim +++ b/tests/script/general/tag/int_binary.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/int_float.sim b/tests/script/general/tag/int_float.sim index 4cb85b7e3d68acb8dc599ceb9ec8e8fd5bb6c3b0..4745ae704f87e885518bcaeeae812fa732a24535 100644 --- a/tests/script/general/tag/int_float.sim +++ b/tests/script/general/tag/int_float.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/set.sim b/tests/script/general/tag/set.sim index 0c6ddd17d03ae5ef0f7f7b9ddde9f51a8d400d9a..fd9fdd2807eae81ac959584e25e4e8a05dd35e84 100644 --- a/tests/script/general/tag/set.sim +++ b/tests/script/general/tag/set.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/smallint.sim b/tests/script/general/tag/smallint.sim index f38f6e2340cdd52979ab13cf452d91dfb990d52b..701e605e3823db519009aa39292c31103785d59c 100644 --- a/tests/script/general/tag/smallint.sim +++ b/tests/script/general/tag/smallint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/tag/tinyint.sim b/tests/script/general/tag/tinyint.sim index f88cf0f61d147c2b30399127186ee5b2a8e745ad..b65be720362993dabea8b7fd81631210b3fe1ade 100644 --- a/tests/script/general/tag/tinyint.sim +++ b/tests/script/general/tag/tinyint.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/user/basic1.sim b/tests/script/general/user/basic1.sim index 4bc7deae839f154181fd26b46f649dfa75e1738f..1cff77d3170794a972d3f4ecf77b4db23029331d 100644 --- a/tests/script/general/user/basic1.sim +++ b/tests/script/general/user/basic1.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/user/monitor.sim b/tests/script/general/user/monitor.sim index d53ade2e4b6c359acda498edd4f7a65b4cd5f9cf..987cb84357ec09314d50f1964a1cf496b4b6a447 100644 --- a/tests/script/general/user/monitor.sim +++ b/tests/script/general/user/monitor.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 print ========== step1 system sh/cfg.sh -n dnode1 -c clog -v 0 diff --git a/tests/script/general/user/pass_alter.sim b/tests/script/general/user/pass_alter.sim index d815ca824f211eee1dca21cd0576c7ef2130b52e..f7eee1359b8b676134c521abc8d5276c3fbe7635 100644 --- a/tests/script/general/user/pass_alter.sim +++ b/tests/script/general/user/pass_alter.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/general/user/pass_len.sim b/tests/script/general/user/pass_len.sim index 5520ce6f1744d33de8829b5fbaab379d0196ce47..583c2e73d37cad7808c0eb980ba99bdc59437eed 100644 --- a/tests/script/general/user/pass_len.sim +++ b/tests/script/general/user/pass_len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/user/user_create.sim b/tests/script/general/user/user_create.sim index e63246cbd649000c1924056eed30de4b7b8fbef2..8f0d32e7ccf429a4db7a8a937142895fbf7d28ff 100644 --- a/tests/script/general/user/user_create.sim +++ b/tests/script/general/user/user_create.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start sql connect diff --git a/tests/script/general/user/user_len.sim b/tests/script/general/user/user_len.sim index 71198c61cb5e2d5f23c924531ff83f1435d9ccf2..4d2658cec955f58319ac9da9325d320bacbd7a4a 100644 --- a/tests/script/general/user/user_len.sim +++ b/tests/script/general/user/user_len.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_field.sim b/tests/script/general/vector/metrics_field.sim index 187ad51ca2e1142cef2e6eecb80e8a09b4ad6ad8..a883c81e183ef58bb1bb096ddd8c51dba445c1cc 100644 --- a/tests/script/general/vector/metrics_field.sim +++ b/tests/script/general/vector/metrics_field.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_mix.sim b/tests/script/general/vector/metrics_mix.sim index 3baf3732f1920ca15fe02812035b0e670ca5e1b8..26ff0af0631687b0350a0868ea5e60770aac5d3e 100644 --- a/tests/script/general/vector/metrics_mix.sim +++ b/tests/script/general/vector/metrics_mix.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_query.sim b/tests/script/general/vector/metrics_query.sim index 3690c9f29cbfcdf8a90f26e97e53cabd80b6a0bf..d797fa64673f738ba8762c5ab534b101df518e8b 100644 --- a/tests/script/general/vector/metrics_query.sim +++ b/tests/script/general/vector/metrics_query.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_tag.sim b/tests/script/general/vector/metrics_tag.sim index f4a4eea53f72e1f7845ab87dac607f1f2fbc6902..29923d3d42f12126396d3964d8184ab563f0d553 100644 --- a/tests/script/general/vector/metrics_tag.sim +++ b/tests/script/general/vector/metrics_tag.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/metrics_time.sim b/tests/script/general/vector/metrics_time.sim index b2fa6e98b0290bbb68079e7eb62bc5db235efbfb..9400b2a76ae9762e1d640026893ed12ceb02804d 100644 --- a/tests/script/general/vector/metrics_time.sim +++ b/tests/script/general/vector/metrics_time.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/multi.sim b/tests/script/general/vector/multi.sim index c9c7a95c7193ad4c14a0be3023bed200a7ca670b..dfdc015edf42a60f113c7aa79c4835a23e973fe4 100644 --- a/tests/script/general/vector/multi.sim +++ b/tests/script/general/vector/multi.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/single.sim b/tests/script/general/vector/single.sim index e87de13745e84767418cb356dfc39a60b3b4bba2..cd892bfd87c3843642d3dbcc1d1a32aa6021a8ec 100644 --- a/tests/script/general/vector/single.sim +++ b/tests/script/general/vector/single.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_field.sim b/tests/script/general/vector/table_field.sim index 0308ff78c350b499af8e8432c06b6ac95609ea8d..2894b04c6de14d925d914cc736363e3381945582 100644 --- a/tests/script/general/vector/table_field.sim +++ b/tests/script/general/vector/table_field.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_mix.sim b/tests/script/general/vector/table_mix.sim index 0c88406022b3b185eb76041536c4366a12ab9645..9cd40859126b61de33fdc942bdc3cb91f6c68bdc 100644 --- a/tests/script/general/vector/table_mix.sim +++ b/tests/script/general/vector/table_mix.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_query.sim b/tests/script/general/vector/table_query.sim index 5a94f3058542702ff959d2ee13d3901f9003943f..1e1784e7266a2cd879974e4be18f03190c627ae6 100644 --- a/tests/script/general/vector/table_query.sim +++ b/tests/script/general/vector/table_query.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/general/vector/table_time.sim b/tests/script/general/vector/table_time.sim index 6a661ba9699b052c230f8e23bef5744690a7435b..f0b0d525e6e39fa1887d8a7622e0eadd89758faf 100644 --- a/tests/script/general/vector/table_time.sim +++ b/tests/script/general/vector/table_time.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index 63c65d0345a9ddaec955777140ae92367b98cb7d..6439b0ff6c8c170aae82858aea4d5692459c4ab5 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -2,28 +2,23 @@ echo "Executing deploy.sh" -if [ $# != 6 ]; then +if [ $# != 4 ]; then echo "argument list need input : " echo " -n nodeName" - echo " -i nodeIp" - echo " -m masterIp" + echo " -i nodePort" exit 1 fi NODE_NAME= -NODE_IP= -MSATER_IP= -while getopts "n:i:m:" arg +NODE= +while getopts "n:i:" arg do case $arg in n) NODE_NAME=$OPTARG ;; i) - NODE_IP=$OPTARG - ;; - m) - MASTER_IP=$OPTARG + NODE=$OPTARG ;; ?) echo "unkonw argument" @@ -48,14 +43,6 @@ CFG_DIR=$NODE_DIR/cfg LOG_DIR=$NODE_DIR/log DATA_DIR=$NODE_DIR/data -#echo ============ deploy $NODE_NAME -#echo === masterIp : $MASTER_IP -#echo === nodeIp : $NODE_IP -#echo === nodePath : $EXE_DIR -#echo === cfgPath : $CFG_DIR -#echo === logPath : $LOG_DIR -#echo === dataPath : $DATA_DIR - rm -rf $NODE_DIR mkdir -p $SIM_DIR @@ -83,13 +70,32 @@ if [ -f "$TAOS_FLAG" ] ; then sudo rm -rf $LOG_DIR fi -echo " " >> $TAOS_CFG -echo "masterIp $MASTER_IP" >> $TAOS_CFG +HOSTNAME=`hostname` + +if [ $NODE -eq 1 ]; then + NODE=7100 +elif [ $NODE -eq 2 ]; then + NODE=7200 +elif [ $NODE -eq 3 ]; then + NODE=7300 +elif [ $NODE -eq 4 ]; then + NODE=7400 +elif [ $NODE -eq 5 ]; then + NODE=7500 +elif [ $NODE -eq 6 ]; then + NODE=7600 +elif [ $NODE -eq 7 ]; then + NODE=7700 +elif [ $NODE -eq 8 ]; then + NODE=7800 +fi + +echo " " >> $TAOS_CFG +echo "first ${HOSTNAME}:7100" >> $TAOS_CFG +echo "second ${HOSTNAME}:7200" >> $TAOS_CFG +echo "serverPort ${NODE}" >> $TAOS_CFG echo "dataDir $DATA_DIR" >> $TAOS_CFG echo "logDir $LOG_DIR" >> $TAOS_CFG -echo "publicIp $NODE_IP" >> $TAOS_CFG -echo "internalIp $NODE_IP" >> $TAOS_CFG -echo "privateIp $NODE_IP" >> $TAOS_CFG echo "dDebugFlag 199" >> $TAOS_CFG echo "mDebugFlag 199" >> $TAOS_CFG echo "sdbDebugFlag 199" >> $TAOS_CFG diff --git a/tests/script/test.sh b/tests/script/test.sh index b9660458b02ead666afd94ef82ed452a90eb021f..16330c5d43675bafabbb0420260f89795fd8dc30 100755 --- a/tests/script/test.sh +++ b/tests/script/test.sh @@ -7,12 +7,14 @@ ################################################## set +e +#set -x FILE_NAME= RELEASE=0 ASYNC=0 VALGRIND=0 -while getopts "f:av" arg +UNIQUE=0 +while getopts "f:avu" arg do case $arg in f) @@ -24,6 +26,9 @@ do v) VALGRIND=1 ;; + v) + UNIQUE=1 + ;; ?) echo "unknow argument" ;; @@ -31,11 +36,6 @@ do done cd . -sh/ip.sh -i 1 -s up > /dev/null 2>&1 & -sh/ip.sh -i 2 -s up > /dev/null 2>&1 & -sh/ip.sh -i 3 -s up > /dev/null 2>&1 & -sh/ip.sh -i 4 -s up > /dev/null 2>&1 & -sh/ip.sh -i 5 -s up > /dev/null 2>&1 & # Get responsible directories CODE_DIR=`dirname $0` @@ -51,6 +51,12 @@ else PROGRAM="$BUILD_DIR/bin/tsim -a" fi +if [ $UNIQUE -eq 0 ]; then + PROGRAM=$BUILD_DIR/bin/tsim +else + PROGRAM="$TOP_DIR/../debug/build/bin/tsim -a" +fi + PRG_DIR=$SIM_DIR/tsim CFG_DIR=$PRG_DIR/cfg LOG_DIR=$PRG_DIR/log @@ -74,13 +80,15 @@ TAOS_CFG=$PRG_DIR/cfg/taos.cfg touch -f $TAOS_CFG TAOS_FLAG=$PRG_DIR/flag -echo " " >> $TAOS_CFG -echo "scriptDir ${CODE_DIR}/../script">> $TAOS_CFG -echo "masterIp 192.168.0.1" >> $TAOS_CFG -echo "secondIp 192.168.0.2" >> $TAOS_CFG -echo "localIp 127.0.0.1" >> $TAOS_CFG +HOSTNAME=`hostname` + +echo " " >> $TAOS_CFG +echo "first ${HOSTNAME}:7100" >> $TAOS_CFG +echo "second ${HOSTNAME}:7200" >> $TAOS_CFG +echo "serverPort 7100" >> $TAOS_CFG echo "dataDir $DATA_DIR" >> $TAOS_CFG echo "logDir $LOG_DIR" >> $TAOS_CFG +echo "scriptDir ${CODE_DIR}/../script">> $TAOS_CFG echo "numOfLogLines 100000000" >> $TAOS_CFG echo "dDebugFlag 135" >> $TAOS_CFG echo "mDebugFlag 135" >> $TAOS_CFG @@ -89,12 +97,12 @@ echo "rpcDebugFlag 135" >> $TAOS_CFG echo "tmrDebugFlag 131" >> $TAOS_CFG echo "cDebugFlag 135" >> $TAOS_CFG echo "httpDebugFlag 135" >> $TAOS_CFG -echo "monitorDebugFlag 135" >> $TAOS_CFG +echo "monitorDebugFlag 135" >> $TAOS_CFG echo "udebugFlag 135" >> $TAOS_CFG echo "clog 0" >> $TAOS_CFG echo "asyncLog 0" >> $TAOS_CFG echo "locale en_US.UTF-8" >> $TAOS_CFG -echo " " >> $TAOS_CFG +echo " " >> $TAOS_CFG ulimit -n 600000 ulimit -c unlimited diff --git a/tests/script/tmp/dnode1.sim b/tests/script/tmp/dnode1.sim index 7b6e3723cb8d27378150774f29ed46ac65968a94..67d0dd4c120b1cc13f0a81a5c4416dcd250c3571 100644 --- a/tests/script/tmp/dnode1.sim +++ b/tests/script/tmp/dnode1.sim @@ -1,4 +1,4 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec.sh -n dnode1 -s start sql connect \ No newline at end of file diff --git a/tests/script/tmp/mnodes.sim b/tests/script/tmp/mnodes.sim index 32e72f16ffdf5b11a9a7c57e145aa09c6e348756..38d99bd214c1bc39e66f70f2b0f3926c100f702d 100644 --- a/tests/script/tmp/mnodes.sim +++ b/tests/script/tmp/mnodes.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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 numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 diff --git a/tests/script/tmp/prepare.sim b/tests/script/tmp/prepare.sim index 7890864360713e54bacc943f931e6f1df16d8666..eda045245965fc0755a255ab459b0cfa95af43f5 100644 --- a/tests/script/tmp/prepare.sim +++ b/tests/script/tmp/prepare.sim @@ -1,13 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 2 system sh/cfg.sh -n dnode2 -c commitLog -v 2 diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim index ca7e91e8921868799b52ac093801fe1cd8614fa4..b6eb239052b20f0751caa65eb65b2a5a13650636 100644 --- a/tests/script/unique/account/account_create.sim +++ b/tests/script/unique/account/account_create.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim index f4bc8d0a2fc4b34cf95117b413b0a9754c1e14d6..6d1c148698f5ebd848f88855197775ffec47f333 100644 --- a/tests/script/unique/account/account_delete.sim +++ b/tests/script/unique/account/account_delete.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start @@ -53,7 +51,8 @@ if $rows != 0 then return -1 endi sql show dnodes -if $data03 != 2 then +print $data00 $data01 $data02 $data03 +if $data02 != 2 then return -1 endi sql drop account oroot @@ -68,7 +67,7 @@ show4: endi sql show dnodes -if $data03 != 0 then +if $data02 != 0 then goto show4 endi diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim index 80d1a56a096b16a58adfd38e1088cb0b4dc34845..06fb37bb5af2d09811dad90a6525ff9731b8d6e7 100644 --- a/tests/script/unique/account/account_len.sim +++ b/tests/script/unique/account/account_len.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim index 352e9797e3057b8a88fddbf22613315cd0fa7b6f..e1966e378c6273768c16360afdd0deff5fe754e6 100644 --- a/tests/script/unique/account/authority.sim +++ b/tests/script/unique/account/authority.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim index 6f64975ac284d6e420a76a7fd4e356d1beee023f..b2d8904cc61829ab2c486da170e8496c0b80971d 100644 --- a/tests/script/unique/account/basic.sim +++ b/tests/script/unique/account/basic.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim index 14ee2f6c852a4be1dba8632ed0268da494287d8d..d1d573d3341d0debf2476bbbeec003aee0a46755 100644 --- a/tests/script/unique/account/paras.sim +++ b/tests/script/unique/account/paras.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim index d327d3d4e295dd436c0944199ecce426459c01f2..2c15d5554494a2c4c5bd4562744be28f3d88a6cd 100644 --- a/tests/script/unique/account/pass_alter.sim +++ b/tests/script/unique/account/pass_alter.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim index 426c18adf71fd0d1b1244335365bfb103ceb42a6..acf4f50c6923c47f193cd12145c1ae854a6a8e5d 100644 --- a/tests/script/unique/account/pass_len.sim +++ b/tests/script/unique/account/pass_len.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/testSuite.sim b/tests/script/unique/account/testSuite.sim index dedaf029f74abc0def0ad120f5644d7967e27fe4..9d4141cfe0c086f9a8863fffb00a9cb0f410e265 100644 --- a/tests/script/unique/account/testSuite.sim +++ b/tests/script/unique/account/testSuite.sim @@ -1,12 +1,11 @@ run unique/account/account_create.sim -run unique/account/account_len.sim run unique/account/account_delete.sim -run unique/account/pass_alter.sim -run unique/account/pass_len.sim -run unique/account/user_create.sim -run unique/account/user_len.sim +run unique/account/account_len.sim run unique/account/authority.sim run unique/account/basic.sim run unique/account/paras.sim +run unique/account/pass_alter.sim +run unique/account/pass_len.sim run unique/account/usage.sim -run unique/account/monitor.sim +run unique/account/user_create.sim +run unique/account/user_len.sim diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim index 5b334374c9a270422c0f84a5f7fcc88546bbd7c1..af904815a0b7a3acf9b20760dd33e3d6d07ab082 100644 --- a/tests/script/unique/account/usage.sim +++ b/tests/script/unique/account/usage.sim @@ -1,5 +1,5 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/exec_up.sh -n dnode1 -s start sql connect diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim index 97a48cf8f6b1a69f055d7ec76e4c7fcd8ad3407a..b22cefcf21a1a1f8048b4a038d1c51771307ee03 100644 --- a/tests/script/unique/account/user_create.sim +++ b/tests/script/unique/account/user_create.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim index 260a0c78b5ba7c3941b59594907de5ec6629884d..0e25f554e08390438ac4ab65be67b4dc08ab4f78 100644 --- a/tests/script/unique/account/user_len.sim +++ b/tests/script/unique/account/user_len.sim @@ -1,7 +1,5 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/exec_up.sh -n dnode1 -s start diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim index 10d13b44602461e770c41e98aca99ee2febb7940..32a1396f90b9b2e822f78d9f305afadba624479f 100644 --- a/tests/script/unique/big/balance.sim +++ b/tests/script/unique/big/balance.sim @@ -1,27 +1,27 @@ -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up + + + + + system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c tables -v 1000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c tables -v 1000 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c tables -v 1000 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c tables -v 1000 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 +system sh/deploy.sh -n dnode5 -i 5 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode5 -c tables -v 1000 @@ -104,8 +104,8 @@ show1: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode2 freeVnodes $data3_192.168.0.2 if $data3_192.168.0.1 != 2 then goto show1 endi @@ -160,9 +160,9 @@ show3: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode2 freeVnodes $data3_192.168.0.2 +print dnode3 freeVnodes $data3_192.168.0.3 if $data3_192.168.0.1 != 2 then goto show3 endi @@ -217,8 +217,8 @@ show4: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode3 freeVnodes $data3_192.168.0.3 if $data3_192.168.0.1 != 0 then goto show4 endi @@ -272,8 +272,8 @@ show5: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.4 freeVnodes $data3_192.168.0.4 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode4 freeVnodes $data3_192.168.0.4 if $data3_192.168.0.1 != 0 then goto show5 endi diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim index c3802da1f87b1edafe4e90ac68a51ab8cfaecf56..7d87dc47449b763d58a304f6640592ff74b68eb0 100644 --- a/tests/script/unique/big/maxvnodes.sim +++ b/tests/script/unique/big/maxvnodes.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c clog -v 0 system sh/cfg.sh -n dnode1 -c tables -v 100 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 256 @@ -37,8 +37,8 @@ if $data00 != 25600 then return -1 endi -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c clog -v 0 system sh/cfg.sh -n dnode2 -c tables -v 100 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 256 @@ -60,8 +60,8 @@ show3: endi sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 +print dnode1 freeVnodes $data3_192.168.0.1 +print dnode2 freeVnodes $data3_192.168.0.2 if $data3_192.168.0.1 != 126 then goto show3 endi diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim index 5e1b26aadeed7ae7a0f2c9dd48f2e7eaaa8fd3fe..9e98ddd3490646c82edacbdb4028520b294df226 100644 --- a/tests/script/unique/big/tcp.sim +++ b/tests/script/unique/big/tcp.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c tables -v 30000 diff --git a/tests/script/unique/cluster/backup/balance4.sim b/tests/script/unique/cluster/backup/balance4.sim index fbfd6eb36ca83949e5822a07d27d3f60810e2736..a1fe5713f37ee93efe1586c9a8714a63ba72e546 100644 --- a/tests/script/unique/cluster/backup/balance4.sim +++ b/tests/script/unique/cluster/backup/balance4.sim @@ -1,24 +1,24 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up + + + + + + + + sleep 1000 -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -161,15 +161,15 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show1 @@ -202,15 +202,15 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode5Vnodes != 2 then @@ -231,15 +231,15 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show3 @@ -274,15 +274,15 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode2Vnodes != 2 then goto show4 @@ -302,15 +302,15 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show5 @@ -345,15 +345,15 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode3Vnodes != 2 then goto show6 @@ -373,15 +373,15 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show7 @@ -416,15 +416,15 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode4Vnodes != 2 then goto show8 @@ -444,15 +444,15 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 1 then goto show9 @@ -487,15 +487,15 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode5Vnodes != 2 then goto show10 @@ -520,15 +520,15 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != null then goto show11 @@ -561,15 +561,15 @@ show12: endi sql show dnodes -x show12 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 2 then goto show12 @@ -621,15 +621,15 @@ show13: endi sql show dnodes -x show13 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 0 then goto show13 diff --git a/tests/script/unique/cluster/backup/balance5.sim b/tests/script/unique/cluster/backup/balance5.sim index 15bc83ab5dc7636f285451e7331725cf592ee75b..83486bb813b2b2a3552f2012e549450eb1bd4e1c 100644 --- a/tests/script/unique/cluster/backup/balance5.sim +++ b/tests/script/unique/cluster/backup/balance5.sim @@ -1,24 +1,24 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up + + + + + + + + sleep 1000 -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -144,15 +144,15 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode1Vnodes != 2 then goto show1 @@ -202,17 +202,17 @@ show2: endi sql show dnodes -x show2 $dnode1Status = $data4_192.168.0.1 -print 192.168.0.1 $dnode1Status +print dnode1 $dnode1Status $dnode2Status = $data4_192.168.0.2 -print 192.168.0.2 $dnode2Status +print dnode2 $dnode2Status $dnode3Status = $data4_192.168.0.3 -print 192.168.0.3 $dnode3Status +print dnode3 $dnode3Status $dnode4Status = $data4_192.168.0.4 -print 192.168.0.4 $dnode4Status +print dnode4 $dnode4Status $dnode5Status = $data4_192.168.0.5 -print 192.168.0.5 $dnode5Status +print dnode5 $dnode5Status $dnode6Status = $data4_192.168.0.6 -print 192.168.0.6 $dnode6Status +print dnode6 $dnode6Status if $dnode1Status != online then goto show2 @@ -251,17 +251,17 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes $dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes +print dnode6 $dnode6Vnodes if $dnode1Vnodes != null then goto show3 diff --git a/tests/script/unique/cluster/backup/balancex.sim b/tests/script/unique/cluster/backup/balancex.sim index 8f1cd191d6f176b558f065dbb6dbcd5674020d5a..7d4f5f7660763d85075601a495beae0dbcaf19a9 100644 --- a/tests/script/unique/cluster/backup/balancex.sim +++ b/tests/script/unique/cluster/backup/balancex.sim @@ -1,22 +1,22 @@ -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up + + + + + + + + sleep 1000 -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -143,13 +143,13 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show1 @@ -196,17 +196,17 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes $dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes +print dnode6 $dnode6Vnodes if $dnode5Vnodes != 2 then goto show2 @@ -230,17 +230,17 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes $dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes +print dnode6 $dnode6Vnodes if $dnode1Vnodes != null then goto show3 diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim index 95cfcbd979addcf0de98ceddddf5479dbcd523e3..6d4e67de0e133a58a6025d09e6898a9923d94bcf 100644 --- a/tests/script/unique/cluster/balance1.sim +++ b/tests/script/unique/cluster/balance1.sim @@ -1,19 +1,8 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 @@ -61,9 +50,9 @@ sql insert into c_b1_t2 values(1520000024021, 21) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then return -1 @@ -88,9 +77,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show2 @@ -104,10 +93,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -134,9 +123,9 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show4 @@ -150,17 +139,16 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode2 system sh/exec.sh -n dnode2 -s stop -x SIGINT sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -179,9 +167,9 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show5 @@ -195,10 +183,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 @@ -219,9 +207,9 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then goto show6 @@ -235,16 +223,16 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step7 print ========= add dnode1 sql create dnode 192.168.0.1 sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 @@ -262,9 +250,9 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show7 @@ -278,10 +266,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step8 print ========= drop dnode2 @@ -301,9 +289,9 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show8 @@ -317,10 +305,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -329,8 +317,7 @@ endi print ============================== step9 print ========= add dnode2 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -348,9 +335,9 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show9 @@ -364,10 +351,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step10 print ========= add db4 @@ -389,9 +376,9 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -409,8 +396,8 @@ sql insert into c_b1_t2 values(1520000025026, 26) sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role if $dnode1Role != master then return -1 @@ -431,9 +418,9 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show11 @@ -447,10 +434,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode2 -s stop -x SIGINT @@ -466,8 +453,7 @@ error3: print ============================== step13 print ========= add dnode2 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -481,10 +467,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sql use c_b1_d5; sql create table c_b1_t5 (t timestamp, i int) @@ -505,9 +491,9 @@ sql insert into c_b1_t6 values(1520000024061, 61) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes #if $dnode1Vnodes != 1 then # return -1 @@ -524,10 +510,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sleep 2000 sql create dnode 192.168.0.3 @@ -543,11 +529,11 @@ show14: endi sql show dnodes -x show14 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show14 @@ -563,9 +549,9 @@ sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role print ============================== step15 print ========= create db7 db8 @@ -593,10 +579,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ========== add dnode4 sleep 2000 @@ -616,13 +602,13 @@ show15: endi sql show dnodes -x show15 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show15 @@ -662,11 +648,11 @@ show16: endi sql show dnodes -x show16 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show16 diff --git a/tests/script/unique/cluster/balance1_bug.sim b/tests/script/unique/cluster/balance1_bug.sim index 85b38d6c7ea93cee6a9cb78cd84dfd4beb794f00..1796d8d2f2454518259a889fbfdbb1b8965512c5 100644 --- a/tests/script/unique/cluster/balance1_bug.sim +++ b/tests/script/unique/cluster/balance1_bug.sim @@ -1,19 +1,8 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 @@ -61,9 +50,9 @@ sql insert into c_b1_t2 values(now+5s, 21) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then return -1 @@ -88,9 +77,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show2 @@ -104,10 +93,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -134,9 +123,9 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show4 @@ -150,10 +139,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode2 @@ -172,9 +161,9 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show5 @@ -188,10 +177,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 @@ -212,9 +201,9 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then goto show6 @@ -228,10 +217,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step7 print ========= add dnode1 @@ -249,9 +238,9 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 3 then goto show7 @@ -265,10 +254,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step8 print ========= drop dnode2 @@ -288,9 +277,9 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 1 then goto show8 @@ -304,10 +293,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -328,9 +317,9 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show9 @@ -344,10 +333,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step10 print ========= add db4 @@ -369,9 +358,9 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -389,8 +378,8 @@ sql insert into c_b1_t2 values(now+1s, 25) sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role if $dnode1Role != master then return -1 @@ -411,9 +400,9 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show11 @@ -427,10 +416,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode2 -s stop -x SIGINT @@ -454,10 +443,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sql use c_b1_d5; $x = 0 @@ -492,9 +481,9 @@ sql insert into c_b1_t6 values(now+5s, 61) sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes #if $dnode1Vnodes != 1 then # return -1 @@ -511,10 +500,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sleep 2000 sql create dnode 192.168.0.3 @@ -530,11 +519,11 @@ show14: endi sql show dnodes -x show14 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show14 @@ -550,9 +539,9 @@ sql show mnodes $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role print ============================== step15 print ========= create db7 db8 @@ -580,10 +569,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ========== add dnode4 sleep 2000 @@ -603,13 +592,13 @@ show15: endi sql show dnodes -x show15 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show15 @@ -649,11 +638,11 @@ show16: endi sql show dnodes -x show16 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show16 diff --git a/tests/script/unique/cluster/balance1_single.sim b/tests/script/unique/cluster/balance1_single.sim index 497352544db019e88a4bba6193cda3e96e1e9336..030d6551e091c309c7a97cd658195f2d431b801c 100644 --- a/tests/script/unique/cluster/balance1_single.sim +++ b/tests/script/unique/cluster/balance1_single.sim @@ -1,22 +1,9 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode5 -c secondIp -v 192.168.0.2 +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 numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -59,9 +46,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode2Vnodes +print dnode1 $dnode2Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode3Vnodes +print dnode2 $dnode3Vnodes if $dnode1Vnodes != 4 then goto show1 @@ -92,9 +79,9 @@ sql insert into c_b1_t2 values(now+5s, 21) sql show dnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then return -1 @@ -119,9 +106,9 @@ show2: endi sql show dnodes -x show2 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 3 then goto show2 @@ -135,10 +122,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step3 print ========= add db3 @@ -166,9 +153,9 @@ show4: endi sql show dnodes -x show4 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 1 then goto show4 @@ -182,10 +169,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step5 print ========= add dnode3 @@ -204,9 +191,9 @@ show5: endi sql show dnodes -x show5 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then goto show5 @@ -234,9 +221,9 @@ show6: endi sql show dnodes -x show6 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != null then goto show6 @@ -262,9 +249,9 @@ show7: endi sql show dnodes -x show7 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 3 then goto show7 @@ -291,9 +278,9 @@ show8: endi sql show dnodes -x show8 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 1 then goto show8 @@ -317,9 +304,9 @@ show9: endi sql show dnodes -x show9 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then goto show9 @@ -348,9 +335,9 @@ show10: endi sql show dnodes -x show10 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 2 then goto show10 @@ -379,9 +366,9 @@ show11: endi sql show dnodes -x show11 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode2Vnodes != 0 then goto show11 @@ -436,9 +423,9 @@ sql insert into c_b1_t6 values(now+5s, 61) sql show dnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes #if $dnode2Vnodes != 1 then # return -1 @@ -462,11 +449,11 @@ show14: endi sql show dnodes -x show14 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode2Vnodes != 2 then goto show14 @@ -517,13 +504,13 @@ show15: endi sql show dnodes -x show15 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes $dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes +print dnode5 $dnode5Vnodes if $dnode2Vnodes != 2 then goto show15 @@ -563,11 +550,11 @@ show16: endi sql show dnodes -x show16 $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode2Vnodes != 1 then goto show16 diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim index 65dbfba3618219e03a2d657116d87e9c1f4ecf10..9a0a88b609aa6925bc61cd92512e78654e853e42 100644 --- a/tests/script/unique/cluster/balance2.sim +++ b/tests/script/unique/cluster/balance2.sim @@ -1,27 +1,12 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -107,11 +92,11 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show1 @@ -137,11 +122,11 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show2 @@ -158,10 +143,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode2 -s stop -x SIGINT @@ -170,7 +155,7 @@ print ========= start dnode2 sql create dnode 192.168.0.2 sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -189,11 +174,11 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show3 @@ -210,10 +195,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step4 print ========= drop dnode3 @@ -229,11 +214,11 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 1 then goto show4 @@ -250,10 +235,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role system sh/exec.sh -n dnode3 -s stop -x SIGINT @@ -262,7 +247,7 @@ print ========= start dnode3 sql create dnode 192.168.0.3 sleep 3000 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c clog -v 1 @@ -281,11 +266,11 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show5 @@ -302,10 +287,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step6 print ========= drop dnode1 @@ -326,11 +311,11 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != null then goto show6 @@ -347,10 +332,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step7 print ========= start dnode1 @@ -361,13 +346,13 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 @@ -385,10 +370,10 @@ show7: $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 - print 192.168.0.1 ==> $dnode1Role - print 192.168.0.2 ==> $dnode2Role - print 192.168.0.3 ==> $dnode3Role - print 192.168.0.4 ==> $dnode4Role + print dnode1 ==> $dnode1Role + print dnode2 ==> $dnode2Role + print dnode3 ==> $dnode3Role + print dnode4 ==> $dnode4Role $x = $x + 1 sleep 2000 @@ -397,11 +382,11 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 2 then goto show7 @@ -434,10 +419,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role $x = 0 show8: @@ -448,13 +433,13 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show8 @@ -480,10 +465,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role $x = 0 show9: @@ -494,13 +479,13 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then goto show9 @@ -524,17 +509,15 @@ sql create dnode 192.168.0.1 sql create dnode 192.168.0.4 sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 +system sh/deploy.sh -n dnode1 -i 1 +ssystem sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0 sleep 3000 sleep 3000 -system sh/deploy.sh -n dnode4 -m 192.168.0.2 -i 192.168.0.4 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c clog -v 1 @@ -552,10 +535,10 @@ show10: $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 - print 192.168.0.1 ==> $dnode1Role - print 192.168.0.2 ==> $dnode2Role - print 192.168.0.3 ==> $dnode3Role - print 192.168.0.4 ==> $dnode4Role + print dnode1 ==> $dnode1Role + print dnode2 ==> $dnode2Role + print dnode3 ==> $dnode3Role + print dnode4 ==> $dnode4Role $x = $x + 1 sleep 2000 @@ -564,13 +547,13 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -592,10 +575,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role sql create database c_b2_d5 replica 2 tables 4 sql use c_b2_d5; @@ -624,13 +607,13 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show11 @@ -650,10 +633,10 @@ $dnode1Role = $data3_192.168.0.1 $dnode2Role = $data3_192.168.0.2 $dnode3Role = $data3_192.168.0.3 $dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role print ============================== step12 print ========= check data diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim index 83499a4d664a68e26d510f547259b03db7f05e9e..6e5d910a117970ab77eedc2d236bd5f085251cc7 100644 --- a/tests/script/unique/cluster/balance3.sim +++ b/tests/script/unique/cluster/balance3.sim @@ -1,22 +1,22 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up -system sh/ip.sh -i 8 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 + + + + + + + + + +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/deploy.sh -n dnode6 -i 6 +system sh/deploy.sh -n dnode7 -i 7 +system sh/deploy.sh -n dnode8 -i 8 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 @@ -102,13 +102,13 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show1 @@ -138,13 +138,13 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode4Vnodes != 2 then goto show2 @@ -164,13 +164,13 @@ show3: endi sql show dnodes -x show3 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show3 @@ -190,7 +190,7 @@ system sh/exec.sh -n dnode2 -s stop -x SIGINT print ============================== step4 print ========= start dnode2 sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode2 -c clog -v 1 @@ -209,13 +209,13 @@ show4: endi sql show dnodes -x show4 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode2Vnodes != 2 then goto show4 @@ -235,13 +235,13 @@ show5: endi sql show dnodes -x show5 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show5 @@ -262,7 +262,7 @@ system sh/exec.sh -n dnode3 -s stop -x SIGINT print ============================== step6 print ========= start dnode3 sleep 3000 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode3 -c clog -v 1 @@ -281,13 +281,13 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode3Vnodes != 2 then goto show6 @@ -307,13 +307,13 @@ show7: endi sql show dnodes -x show7 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show7 @@ -333,7 +333,7 @@ system sh/exec.sh -n dnode4 -s stop -x SIGINT print ============================== step8 print ========= start dnode4 sleep 3000 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode4 -c clog -v 1 @@ -352,13 +352,13 @@ show8: endi sql show dnodes -x show8 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode4Vnodes != 2 then goto show8 @@ -383,13 +383,13 @@ show9: endi sql show dnodes -x show9 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then goto show9 @@ -407,7 +407,7 @@ endi print ============================== step10 print ========= start dnode1 sleep 3000 -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 system sh/cfg.sh -n dnode1 -c clog -v 1 @@ -426,13 +426,13 @@ show10: endi sql show dnodes -x show10 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 2 then goto show10 @@ -467,13 +467,13 @@ show11: endi sql show dnodes -x show11 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != 1 then goto show11 @@ -502,13 +502,13 @@ show12: endi sql show dnodes -x show12 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes $dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes +print dnode4 $dnode4Vnodes if $dnode1Vnodes != null then goto show12 diff --git a/tests/script/unique/column/replica3.sim b/tests/script/unique/column/replica3.sim index 2ec78796151c3dd806716364f14c52f39afa3ebe..97c89f89f36bf752120349e817d6f487e34744b8 100644 --- a/tests/script/unique/column/replica3.sim +++ b/tests/script/unique/column/replica3.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/db/commit.sim b/tests/script/unique/db/commit.sim index a9aa674a27d488e00bf7f5d3654c366f077dd112..ec84122b47f085caf9786250a4fc36f0b3f6abd6 100644 --- a/tests/script/unique/db/commit.sim +++ b/tests/script/unique/db/commit.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 2 system sh/cfg.sh -n dnode2 -c commitLog -v 2 diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim index ce1c3fef127aea80384eec8f8ff910030ab82f4b..d22ca2623de9a654913a95eda9611eb63d4a0fda 100644 --- a/tests/script/unique/db/delete.sim +++ b/tests/script/unique/db/delete.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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 clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim index 4e2808dbaa6cdaaba1b011098a44a38b37ccacdf..e599cc6c4afd342b80b854c7e82949f1becdaa63 100644 --- a/tests/script/unique/db/delete_part.sim +++ b/tests/script/unique/db/delete_part.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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 clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_add12.sim b/tests/script/unique/db/replica_add12.sim index 29f9fdbea8d9135604e43c2a2cb3f90d7e010472..b9ce0595c78f54d664db1bd950a66105414d49cb 100644 --- a/tests/script/unique/db/replica_add12.sim +++ b/tests/script/unique/db/replica_add12.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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 clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_add13.sim b/tests/script/unique/db/replica_add13.sim index a4854adc53ca94c8c0471f3601297e8f2ff5cfff..0c44d9d8392e7e752345ffd8f45b10f728eb7a74 100644 --- a/tests/script/unique/db/replica_add13.sim +++ b/tests/script/unique/db/replica_add13.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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 clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_add23.sim b/tests/script/unique/db/replica_add23.sim index 0aebcce988c3ff97faca835ca6c84db0bdb12535..e1cc5767c5195cc9991409644176e983c23d01d1 100644 --- a/tests/script/unique/db/replica_add23.sim +++ b/tests/script/unique/db/replica_add23.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +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 clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_part.sim b/tests/script/unique/db/replica_part.sim index 144c3f674fa43125cff0bc6104d186d55b80236c..d8075434dc2227fdc95108d25797cff848a4ba86 100644 --- a/tests/script/unique/db/replica_part.sim +++ b/tests/script/unique/db/replica_part.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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 clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_reduce21.sim b/tests/script/unique/db/replica_reduce21.sim index 9f15cf3453d4a2dadbea6587646415b1ba67c44b..09d295125a21397f6543cdeb677e0699e439f3c4 100644 --- a/tests/script/unique/db/replica_reduce21.sim +++ b/tests/script/unique/db/replica_reduce21.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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 clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_reduce31.sim b/tests/script/unique/db/replica_reduce31.sim index c34dccbd621e70ebf4b8ff987573d3593babfc30..214b064afb05147f6d561e7f052257bcc5ee7c0a 100644 --- a/tests/script/unique/db/replica_reduce31.sim +++ b/tests/script/unique/db/replica_reduce31.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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 clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/db/replica_reduce32.sim b/tests/script/unique/db/replica_reduce32.sim index a9cda824b83c4faf90b35c6da00e6454b98a5a70..c1d4893a3eda831c632e0f5416ea0b8ac55bde40 100644 --- a/tests/script/unique/db/replica_reduce32.sim +++ b/tests/script/unique/db/replica_reduce32.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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 clog -v 2 system sh/cfg.sh -n dnode2 -c clog -v 2 diff --git a/tests/script/unique/dnode/backup/balance4.sim b/tests/script/unique/dnode/backup/balance4.sim deleted file mode 100644 index 914f254ef208d6b7c1242cccb89a443acc67f7a4..0000000000000000000000000000000000000000 --- a/tests/script/unique/dnode/backup/balance4.sim +++ /dev/null @@ -1,435 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode6 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode7 -c numOfMPeers -v 1 - -system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4 - -system sh/cfg.sh -n dnode1 -c statusInterval -v 1 -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 dnode5 -c statusInterval -v 1 -system sh/cfg.sh -n dnode6 -c statusInterval -v 1 -system sh/cfg.sh -n dnode7 -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 dnode5 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode6 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode7 -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 dnode7 -c balanceStartInterval -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 dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 -system sh/cfg.sh -n dnode5 -c commitLog -v 0 -system sh/cfg.sh -n dnode6 -c commitLog -v 0 -system sh/cfg.sh -n dnode7 -c commitLog -v 0 - -system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 4 - -print ============================ step1 -print ========= start dnode1-5 -system sh/exec.sh -n dnode1 -s start -sleep 4001 -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - 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 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start -system sh/exec.sh -n dnode4 -s start -system sh/exec.sh -n dnode5 -s start -sleep 4001 -$x = 0 -created1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create database d_b4_d1 replica 4 -x created1 -sql use d_b4_d1 - -create1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b4_d1 (t timestamp, i int) -x create1 -sql insert into d_b4_d1 values(now+1s, 15) -sql insert into d_b4_d1 values(now+2s, 14) -sql insert into d_b4_d1 values(now+2s, 13) -sql insert into d_b4_d1 values(now+3s, 12) -sql insert into d_b4_d1 values(now+4s, 11) - -sql create database d_b4_d2 replica 4 -sql use d_b4_d2 - -create2: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b4_d2 (t timestamp, i int) -x create2 -sql insert into d_b4_d2 values(now+1s, 25) -sql insert into d_b4_d2 values(now+2s, 24) -sql insert into d_b4_d2 values(now+3s, 23) -sql insert into d_b4_d2 values(now+4s, 22) -sql insert into d_b4_d2 values(now+5s, 21) - -$x = 0 -show1: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show1 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes - -if $dnode1Vnodes != 4 then - goto show1 -endi -if $dnode2Vnodes != 2 then - goto show1 -endi -if $dnode3Vnodes != 2 then - goto show1 -endi -if $dnode4Vnodes != 2 then - goto show1 -endi -if $dnode5Vnodes != 2 then - goto show1 -endi - -print ============================ step2 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 7000 -$x = 0 -show2: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes - -if $dnode1Vnodes != 2 then - goto show2 -endi -if $dnode3Vnodes != 2 then - goto show2 -endi -if $dnode4Vnodes != 2 then - goto show2 -endi -if $dnode5Vnodes != 2 then - goto show2 -endi - -system sh/exec.sh -n dnode2 -s stop - -print ============================ step3 -print ========= start dnode6 -sql create dnode 192.168.0.6 -system sh/exec.sh -n dnode6 -s start -sleep 4000 -$x = 0 -show3: - $x = $x + 1 - sleep 6000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show3 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 4 then - goto show3 -endi -if $dnode3Vnodes != 2 then - goto show3 -endi -if $dnode4Vnodes != 2 then - goto show3 -endi -if $dnode5Vnodes != 2 then - goto show3 -endi -if $dnode6Vnodes != 2 then - goto show3 -endi - -print ============================ step4 -print ========= add db3 -sql create database d_b4_d3 replica 4 -sql use d_b4_d3 - -create3: - $x = $x + 1 - sleep 1000 - if $x == 20 then - return -1 - endi -sql create table d_b4_d3 (t timestamp, i int) -x create3 -sql insert into d_b4_d3 values(now+1s, 35) -sql insert into d_b4_d3 values(now+2s, 34) -sql insert into d_b4_d3 values(now+3s, 33) -sql insert into d_b4_d3 values(now+4s, 32) -sql insert into d_b4_d3 values(now+5s, 31) - -$x = 0 -show4: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 4 then - goto show4 -endi -if $dnode3Vnodes != 1 then - goto show4 -endi -if $dnode4Vnodes != 1 then - goto show4 -endi -if $dnode5Vnodes != 1 then - goto show4 -endi -if $dnode6Vnodes != 1 then - goto show4 -endi - -print ============================ step5 -print ========= start dnode7 -sql create dnode 192.168.0.7 -system sh/exec.sh -n dnode7 -s start -sleep 7000 -$x = 0 -show5: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show5 -endi -if $dnode7Vnodes != 2 then - goto show5 -endi - -print ============================ step6 -print ========= drop dnode3 -sql drop dnode 192.168.0.3 -sleep 7000 -$x = 0 -show6: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show6 -endi -if $dnode4Vnodes != 1 then - goto show6 -endi -if $dnode5Vnodes != 1 then - goto show6 -endi -if $dnode6Vnodes != 1 then - goto show6 -endi -if $dnode7Vnodes != 1 then - goto show6 -endi - -system sh/exec.sh -n dnode3 -s stop - -return -print ============================ step7 -print ========= check data - -sql use d_b4_d1 -sql select * from d_b4_d1 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 11 then - return -1 -endi -if $data11 != 12 then - return -1 -endi -if $data21 != 13 then - return -1 -endi -if $data31 != 14 then - return -1 -endi -if $data41 != 15 then - return -1 -endi - -sql use d_b4_d2 -sql select * from d_b4_d2 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 21 then - return -1 -endi -if $data11 != 22 then - return -1 -endi -if $data21 != 23 then - return -1 -endi -if $data31 != 24 then - return -1 -endi -if $data41 != 25 then - return -1 -endi - -sql use d_b4_d3 -sql select * from d_b4_d3 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 31 then - return -1 -endi -if $data11 != 32 then - return -1 -endi -if $data21 != 33 then - return -1 -endi -if $data31 != 34 then - return -1 -endi -if $data41 != 35 then - return -1 -endi - - -print ============================================ over -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop -system sh/exec.sh -n dnode7 -s stop diff --git a/tests/script/unique/dnode/backup/balance5.sim b/tests/script/unique/dnode/backup/balance5.sim deleted file mode 100644 index ac6157ca93dbe4eb75f2c677f24d6a103825e18e..0000000000000000000000000000000000000000 --- a/tests/script/unique/dnode/backup/balance5.sim +++ /dev/null @@ -1,469 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 -system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode6 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode7 -c numOfMPeers -v 1 -system sh/cfg.sh -n dnode8 -c numOfMPeers -v 1 - -system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4 -system sh/cfg.sh -n dnode8 -c numOfTotalVnodes -v 4 - -system sh/cfg.sh -n dnode1 -c statusInterval -v 1 -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 dnode5 -c statusInterval -v 1 -system sh/cfg.sh -n dnode6 -c statusInterval -v 1 -system sh/cfg.sh -n dnode7 -c statusInterval -v 1 -system sh/cfg.sh -n dnode8 -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 dnode5 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode6 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode7 -c balanceMonitorInterval -v 1 -system sh/cfg.sh -n dnode8 -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 dnode7 -c balanceStartInterval -v 10 -system sh/cfg.sh -n dnode8 -c balanceStartInterval -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 dnode3 -c commitLog -v 0 -system sh/cfg.sh -n dnode4 -c commitLog -v 0 -system sh/cfg.sh -n dnode5 -c commitLog -v 0 -system sh/cfg.sh -n dnode6 -c commitLog -v 0 -system sh/cfg.sh -n dnode7 -c commitLog -v 0 -system sh/cfg.sh -n dnode8 -c commitLog -v 0 - -system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 4 -system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 4 - -print ============================ step1 -print ========= start dnode1-5 -system sh/exec.sh -n dnode1 -s start - -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql connect -x connectTbase -sleep 4001 -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 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start -system sh/exec.sh -n dnode4 -s start -system sh/exec.sh -n dnode5 -s start -system sh/exec.sh -n dnode6 -s start -sleep 4001 -$x = 0 -created1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create database d_b5_d1 replica 5 -x created1 -sql use d_b5_d1 - -create1: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b5_t1 (t timestamp, i int) -x create1 -sql insert into d_b5_t1 values(now+1s, 15) -sql insert into d_b5_t1 values(now+2s, 14) -sql insert into d_b5_t1 values(now+2s, 13) -sql insert into d_b5_t1 values(now+3s, 12) -sql insert into d_b5_t1 values(now+4s, 11) - -sql create database d_b5_d2 replica 5 -sql use d_b5_d2 -create2: - $x = $x + 1 - sleep 1000 - if $x == 10 then - return -1 - endi -sql create table d_b5_t2 (t timestamp, i int) -x create2 -sql insert into d_b5_t2 values(now+1s, 25) -sql insert into d_b5_t2 values(now+2s, 24) -sql insert into d_b5_t2 values(now+3s, 23) -sql insert into d_b5_t2 values(now+4s, 22) -sql insert into d_b5_t2 values(now+5s, 21) - -$x = 0 -show1: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show1 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 4 then - goto show1 -endi -if $dnode2Vnodes != 2 then - goto show1 -endi -if $dnode3Vnodes != 2 then - goto show1 -endi -if $dnode4Vnodes != 2 then - goto show1 -endi -if $dnode5Vnodes != 2 then - goto show1 -endi -if $dnode6Vnodes != 2 then - goto show1 -endi - -print ============================ step2 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 7000 -$x = 0 -show2: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show2 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes - -if $dnode1Vnodes != 2 then - goto show2 -endi -if $dnode3Vnodes != 2 then - goto show2 -endi -if $dnode4Vnodes != 2 then - goto show2 -endi -if $dnode5Vnodes != 2 then - goto show2 -endi -if $dnode6Vnodes != 2 then - goto show2 -endi - -system sh/exec.sh -n dnode2 -s stop - -print ============================ step3 -print ========= start dnode7 -sql create dnode 192.168.0.7 -system sh/exec.sh -n dnode7 -s start -sleep 5000 -$x = 0 -show3: - $x = $x + 1 - sleep 5000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show3 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show3 -endi -if $dnode3Vnodes != 2 then - goto show3 -endi -if $dnode4Vnodes != 2 then - goto show3 -endi -if $dnode5Vnodes != 2 then - goto show3 -endi -if $dnode6Vnodes != 2 then - goto show3 -endi -if $dnode7Vnodes != 2 then - goto show3 -endi - -print ============================ step4 -print ========= add db3 -sql create database d_b5_d3 replica 5 -sql use d_b5_d3 -create3: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql create table d_b5_t3 (t timestamp, i int) -x create3 -sql insert into d_b5_t3 values(now+1s, 35) -sql insert into d_b5_t3 values(now+2s, 34) -sql insert into d_b5_t3 values(now+3s, 33) -sql insert into d_b5_t3 values(now+4s, 32) -sql insert into d_b5_t3 values(now+5s, 31) - -$x = 0 -show4: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show4 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes - -if $dnode1Vnodes != 4 then - goto show4 -endi -if $dnode3Vnodes != 1 then - goto show4 -endi -if $dnode4Vnodes != 1 then - goto show4 -endi -if $dnode5Vnodes != 1 then - goto show4 -endi -if $dnode6Vnodes != 1 then - goto show4 -endi -if $dnode7Vnodes != 1 then - goto show4 -endi - -print ============================ step5 -print ========= start dnode8 -sql create dnode 192.168.0.8 -system sh/exec.sh -n dnode8 -s start -sleep 7000 -$x = 0 -show5: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show5 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode8Vnodes = $data3_192.168.0.8 -print 192.168.0.8 $dnode8Vnodes - -if $dnode1Vnodes != 4 then - goto show5 -endi -if $dnode8Vnodes != 2 then - goto show5 -endi - -print ============================ step6 -print ========= drop dnode3 -sql drop dnode 192.168.0.3 -sleep 7000 -$x = 0 -show6: - $x = $x + 1 - sleep 2000 - if $x == 10 then - return -1 - endi -sql show dnodes -x show6 -$dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode4Vnodes = $data3_192.168.0.4 -print 192.168.0.4 $dnode4Vnodes -$dnode5Vnodes = $data3_192.168.0.5 -print 192.168.0.5 $dnode5Vnodes -$dnode6Vnodes = $data3_192.168.0.6 -print 192.168.0.6 $dnode6Vnodes -$dnode7Vnodes = $data3_192.168.0.7 -print 192.168.0.7 $dnode7Vnodes -$dnode8Vnodes = $data3_192.168.0.8 -print 192.168.0.8 $dnode8Vnodes - -if $dnode1Vnodes != 4 then - goto show6 -endi -if $dnode4Vnodes != 1 then - goto show6 -endi -if $dnode5Vnodes != 1 then - goto show6 -endi -if $dnode6Vnodes != 1 then - goto show6 -endi -if $dnode7Vnodes != 1 then - goto show6 -endi -if $dnode8Vnodes != 1 then - goto show6 -endi - -system sh/exec.sh -n dnode3 -s stop - -return -print ============================ step7 -print ========= check data - -sql use d_b5_d1 -sql select * from d_b5_t1 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 11 then - return -1 -endi -if $data11 != 12 then - return -1 -endi -if $data21 != 13 then - return -1 -endi -if $data31 != 14 then - return -1 -endi -if $data41 != 15 then - return -1 -endi - -sql use d_b5_d2 -sql select * from d_b5_t2 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 21 then - return -1 -endi -if $data11 != 22 then - return -1 -endi -if $data21 != 23 then - return -1 -endi -if $data31 != 24 then - return -1 -endi -if $data41 != 25 then - return -1 -endi - -sql use d_b5_d3 -sql select * from d_b5_t3 -print $data01 $data11 $data21 $data31 $data41 -if $data01 != 31 then - return -1 -endi -if $data11 != 32 then - return -1 -endi -if $data21 != 33 then - return -1 -endi -if $data31 != 34 then - return -1 -endi -if $data41 != 35 then - return -1 -endi - - -print ============================================ over -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop -system sh/exec.sh -n dnode7 -s stop -system sh/exec.sh -n dnode8 -s stop diff --git a/tests/script/unique/dnode/backup/unremove.sim b/tests/script/unique/dnode/backup/unremove.sim deleted file mode 100644 index 75aaeb949bd1758cc9bafefddf08da8d15916a5e..0000000000000000000000000000000000000000 --- a/tests/script/unique/dnode/backup/unremove.sim +++ /dev/null @@ -1,149 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.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 -system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4 - -system sh/cfg.sh -n dnode1 -c commitLog -v 1 -system sh/cfg.sh -n dnode2 -c commitLog -v 1 -system sh/cfg.sh -n dnode3 -c commitLog -v 1 -system sh/cfg.sh -n dnode4 -c commitLog -v 1 - -print ========== step1 -system sh/exec.sh -n dnode1 -s start -sql connect -sql create dnode 192.168.0.2 -sql create dnode 192.168.0.3 -system sh/exec.sh -n dnode2 -s start -system sh/exec.sh -n dnode3 -s start -sleep 3000 - -sql create database d1 replica 3 -sql create table d1.t1 (t timestamp, i int) -sql insert into d1.t1 values(now+1s, 15) -sql insert into d1.t1 values(now+2s, 14) -sql insert into d1.t1 values(now+2s, 13) -sql insert into d1.t1 values(now+3s, 12) -sql insert into d1.t1 values(now+4s, 11) - -print ========== step2 -sql drop dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 - -sql alter dnode 192.168.0.2 unremove -system sh/exec.sh -n dnode2 -s start - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 3 then - return -1 -endi -if $data3_192.168.0.2 != 3 then - return -endi -if $data3_192.168.0.3 != 3 then - return -1 -endi - -print ========== step3 -sql drop dnode 192.168.0.2 -system sh/exec.sh -n dnode2 -s stop -x SIGINT -sleep 3000 - -sql alter dnode 192.168.0.2 unremove -system sh/exec.sh -n dnode2 -s start - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 3 then - return -1 -endi -if $data3_192.168.0.2 != 3 then - return -1 -endi -if $data3_192.168.0.3 != 3 then - return -1 -endi - -print ========== step4 -sql create dnode 192.168.0.4 -sql drop dnode 192.168.0.2 - -sleep 5000 -sql show dnodes -$dnode1Vnodes = $data2_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes -$dnode2Vnodes = $data2_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes -$dnode3Vnodes = $data2_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -if $data3_192.168.0.1 != 3 then - return -1 -endi -if $data3_192.168.0.2 != 3 then - return -1 -endi -if $data3_192.168.0.3 != 3 then - return -1 -endi - -print ========== step5 -system sh/exec.sh -n dnode4 -s start -sleep 3000 - -$x = 0 -show5: - $x = $x + 1 - sleep 5000 - if $x == 20 then - return -1 - endi - -sql show dnodes -print 192.168.0.1 freeVnodes $data3_192.168.0.1 -print 192.168.0.2 freeVnodes $data3_192.168.0.2 -print 192.168.0.3 freeVnodes $data3_192.168.0.3 -print 192.168.0.4 freeVnodes $data3_192.168.0.4 -if $data3_192.168.0.1 != 3 then - goto show5 -endi -if $data3_192.168.0.2 != null then - goto show5 -endi -if $data3_192.168.0.3 != 3 then - goto show5 -endi -if $data3_192.168.0.4 != 3 then - goto show5 -endi diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim index 493f712c57c37679a20656dcd1ab38e4c8221c69..eff6b1e51d8c0e4ba14d2619390cb77fc074a6ee 100644 --- a/tests/script/unique/dnode/balance1.sim +++ b/tests/script/unique/dnode/balance1.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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 @@ -49,7 +49,7 @@ sql insert into d1.t1 values(now+4s, 12) sql insert into d1.t1 values(now+5s, 11) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 1 then return -1 endi @@ -68,8 +68,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 0 then goto show2 endi @@ -87,8 +87,8 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 0 then return -1 endi @@ -108,8 +108,8 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 2 then goto show4 endi @@ -135,9 +135,9 @@ show5: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.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 goto show5 endi @@ -158,9 +158,9 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.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 return -1 @@ -185,10 +185,10 @@ show7: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.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 goto show7 endi @@ -212,10 +212,10 @@ sql insert into d4.t4 values(now+4s, 42) sql insert into d4.t4 values(now+5s, 41) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.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 @@ -242,10 +242,10 @@ show9: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.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 goto show9 diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim index 5e887d54f5411cf3a8f3cfd42b62d9bebcd190f5..d38952ea4f730aa86a45362549f7ad3cb4794be9 100644 --- a/tests/script/unique/dnode/balance2.sim +++ b/tests/script/unique/dnode/balance2.sim @@ -1,16 +1,16 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 + + + + + + +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 @@ -63,9 +63,9 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then return -1 endi @@ -88,9 +88,9 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 2 then goto show2 endi @@ -116,10 +116,10 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.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 != 4 then goto show3 endi @@ -143,10 +143,10 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.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 != 4 then return -1 endi @@ -173,11 +173,11 @@ show5: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +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 goto show5 endi @@ -206,11 +206,11 @@ show6: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +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 goto show6 endi diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim index 7baa6444eed59d34fd65d5bc159827864e6fddbd..b379b50119b2a05f6556113f7f3721b39f53155c 100644 --- a/tests/script/unique/dnode/balance3.sim +++ b/tests/script/unique/dnode/balance3.sim @@ -1,18 +1,18 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 + + + + + + + +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/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 @@ -71,10 +71,10 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.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 != 4 then return -1 @@ -101,10 +101,10 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.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 != 2 then goto show2 @@ -134,11 +134,11 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +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 goto show3 @@ -174,11 +174,11 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +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 goto show4 @@ -209,11 +209,11 @@ show5: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +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 goto show5 @@ -236,11 +236,11 @@ show6: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.168.0.4 openVnodes $data3_4 -print 192.168.0.5 openVnodes $data3_5 +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 goto show6 diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim index 9153224a227f8b5294d595f5c6abeff6270c3a1e..78046d36388d3453673c13bac4fe0da61beab31b 100644 --- a/tests/script/unique/dnode/balancex.sim +++ b/tests/script/unique/dnode/balancex.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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 @@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 2 then return -1 endi @@ -70,8 +70,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show2 endi @@ -96,8 +96,8 @@ show3: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 3 then goto show3 endi @@ -117,9 +117,9 @@ show4: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show4 endi @@ -141,9 +141,9 @@ show5: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 3 then goto show5 endi diff --git a/tests/script/unique/dnode/basic1.sim b/tests/script/unique/dnode/basic1.sim index cfd84bbc164fdfb1fad9fcbbac2be069d1d10cc9..1d1f16c7603c09d90672df1a64129787bdd69ce5 100644 --- a/tests/script/unique/dnode/basic1.sim +++ b/tests/script/unique/dnode/basic1.sim @@ -1,6 +1,6 @@ system sh/stop_dnodes.sh -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/exec_up.sh -n dnode1 -s start system sh/exec_up.sh -n dnode2 -s start sql connect diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim index c95ddac43c1b081de18671a7bfe659b2c2acc8fb..a2e650ed717b5bce554b2b4aa7f9feba450204eb 100644 --- a/tests/script/unique/dnode/monitor_bug.sim +++ b/tests/script/unique/dnode/monitor_bug.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +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 @@ -27,7 +27,7 @@ sql connect sleep 5000 sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 3 then return -1 endi @@ -45,8 +45,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show2 endi diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim index d61971a43927518a51a0f71bafed6eaea6177022..71053f378aedf03db778082e3f2eb305cf4bbdf9 100644 --- a/tests/script/unique/dnode/offline1.sim +++ b/tests/script/unique/dnode/offline1.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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 diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim index 9a0bfd18b7f297d0247913218f7a1cd784237737..9f265d398acf25ac4f140a26de2dbb82a0c15131 100644 --- a/tests/script/unique/dnode/offline2.sim +++ b/tests/script/unique/dnode/offline2.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +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 diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim index 76429cdd2254027cb2228a75eb13688801d0f746..5b18c981b4f4c1d366ef89cc1a7697fe7e4cc3c8 100644 --- a/tests/script/unique/dnode/remove1.sim +++ b/tests/script/unique/dnode/remove1.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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 @@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 2 then return -1 endi @@ -79,8 +79,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 3 then goto show2 endi @@ -101,8 +101,8 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 $data5_192.168.0.2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 $data5_192.168.0.2 print ========== step4 sql create dnode 192.168.0.3 @@ -117,9 +117,9 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_2 != null then goto show4 endi @@ -138,10 +138,10 @@ show5: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 -print 192.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 != 4 then goto show5 endi diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim index 9b808920a659bceb0cd455ecce088be55ba2735c..338322fb6e6678a4a44eaf4e4b863e1bfdff633f 100644 --- a/tests/script/unique/dnode/remove2.sim +++ b/tests/script/unique/dnode/remove2.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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 @@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22) sql insert into d2.t2 values(now+5s, 21) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 2 then return -1 endi @@ -79,8 +79,8 @@ show2: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 3 then goto show2 endi @@ -102,8 +102,8 @@ show3: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 $data5_192.168.0.2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 $data5_192.168.0.2 print ========== step4 sql create dnode 192.168.0.3 @@ -118,9 +118,9 @@ show4: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_2 != null then goto show4 endi diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim index 2ce9645108a2f40b28eeb9e3cc3093416fb92536..d670a6b3b7d2069e1dd8dbe9cbe08c5a7e7f34b7 100644 --- a/tests/script/unique/dnode/vnode_clean.sim +++ b/tests/script/unique/dnode/vnode_clean.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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 @@ -43,7 +43,7 @@ sql insert into d1.t1 values(now+4s, 12) sql insert into d1.t1 values(now+5s, 11) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 +print dnode1 openVnodes $data3_1 if $data3_1 != 3 then return -1 endi @@ -60,8 +60,8 @@ show2: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show2 endi @@ -81,8 +81,8 @@ sql insert into d2.t2 values(now+5s, 21) $x = 0 sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then return -1 endi @@ -101,8 +101,8 @@ show4: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 2 then goto show4 endi @@ -118,9 +118,8 @@ system sh/exec_up.sh -n dnode2 -s stop -x SIGINT print ========== step5 sleep 2000 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +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 secondIp -v 192.168.0.2 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 mgmtEqualVnodeNum -v 4 @@ -135,8 +134,8 @@ show5: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then goto show5 endi @@ -154,8 +153,8 @@ sql insert into d3.t3 values(now+4s, 32) sql insert into d3.t3 values(now+5s, 31) sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 if $data3_1 != 4 then return -1 endi @@ -176,9 +175,9 @@ show7: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show7 endi @@ -206,9 +205,9 @@ show8: return -1 endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show8 endi @@ -231,9 +230,9 @@ show9: endi sql show dnodes -print 192.168.0.1 openVnodes $data3_1 -print 192.168.0.2 openVnodes $data3_2 -print 192.168.0.3 openVnodes $data3_3 +print dnode1 openVnodes $data3_1 +print dnode2 openVnodes $data3_2 +print dnode3 openVnodes $data3_3 if $data3_1 != 4 then goto show9 endi diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim index b09acd614d4b562d559378e82f19741768b5ef0a..e1237617a8e63e30946b31ed6196ac11d8aaa602 100644 --- a/tests/script/unique/http/admin.sim +++ b/tests/script/unique/http/admin.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135 diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim index 985f1827db6f25a44f926b710707ce77081b3daf..36fba4c24e6aa91f69ec19a26a3496fd53d8dc6d 100644 --- a/tests/script/unique/http/opentsdb.sim +++ b/tests/script/unique/http/opentsdb.sim @@ -1,7 +1,7 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 + +system sh/deploy.sh -n dnode1 -i 1 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim index ec806d71a0071a74376bad014c730ccf189d5dd4..ec9bf8d3f5dc925d4142860f10251d120db50d0d 100644 --- a/tests/script/unique/import/replica2.sim +++ b/tests/script/unique/import/replica2.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 3000 diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim index 4dfa26a6b29e778a74adacb27bf42bf3a402ce3a..99e46a8506501fd1b95050267eca482392e01ea5 100644 --- a/tests/script/unique/import/replica3.sim +++ b/tests/script/unique/import/replica3.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1 @@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0 system sh/cfg.sh -n dnode3 -c commitlog -v 0 system sh/cfg.sh -n dnode4 -c commitlog -v 0 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2 - print ========= start dnode1 system sh/exec.sh -n dnode1 -s start sleep 5000 diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim index 35c20986cb6f8a1d257011eed956b39c412ab312..eaa6a14e412eea6b7ddbc47d31ea5e1ca4e5a0e4 100644 --- a/tests/script/unique/metrics/balance_replica1.sim +++ b/tests/script/unique/metrics/balance_replica1.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 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 @@ -71,9 +71,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 @@ -95,9 +95,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show2 diff --git a/tests/script/unique/metrics/dnode2.sim b/tests/script/unique/metrics/dnode2.sim index 68000fb0468836dd60a09554a1340a8ea4e01e07..449f49b7d7e44b4170238e6fc04b1af1d94669da 100644 --- a/tests/script/unique/metrics/dnode2.sim +++ b/tests/script/unique/metrics/dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/unique/metrics/dnode2_stop.sim b/tests/script/unique/metrics/dnode2_stop.sim index 2570e0789f65d9874c7f536e1cfc8dea363ca218..90af978e6d9cc8f21ee8f356d1b1303ead4937da 100644 --- a/tests/script/unique/metrics/dnode2_stop.sim +++ b/tests/script/unique/metrics/dnode2_stop.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/unique/metrics/dnode3.sim b/tests/script/unique/metrics/dnode3.sim index 1e7dcffc24e8c04fb6672883ca16dfea491aaed6..44f6687d42b5255bff4e1cca61f6fb91285676d5 100644 --- a/tests/script/unique/metrics/dnode3.sim +++ b/tests/script/unique/metrics/dnode3.sim @@ -1,11 +1,11 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 @@ -82,11 +82,11 @@ endi sql show dnodes $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes $dnode3Vnodes = $data3_192.168.0.3 -print 192.168.0.3 $dnode3Vnodes +print dnode3 $dnode3Vnodes if $dnode1Vnodes != 3 then return -1 diff --git a/tests/script/unique/metrics/replica2_dnode4.sim b/tests/script/unique/metrics/replica2_dnode4.sim index 8f2f4a9c0caa4da9b887821f2109e05667d6ea0e..a1ffb65b0f348e2cab5085fa4cbc962af58eb113 100644 --- a/tests/script/unique/metrics/replica2_dnode4.sim +++ b/tests/script/unique/metrics/replica2_dnode4.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/metrics/replica2_vnode3.sim b/tests/script/unique/metrics/replica2_vnode3.sim index ab808b86034331f873a0edfe341a373b1881295f..aed98aceff1a27e22673d03cd26e9af51d47939d 100644 --- a/tests/script/unique/metrics/replica2_vnode3.sim +++ b/tests/script/unique/metrics/replica2_vnode3.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4 diff --git a/tests/script/unique/metrics/replica3_dnode6.sim b/tests/script/unique/metrics/replica3_dnode6.sim index 799633b8f0248e6b7a508bfaf3031b143231a853..974bc793adf1d787347b06aeb7f490eac9218c95 100644 --- a/tests/script/unique/metrics/replica3_dnode6.sim +++ b/tests/script/unique/metrics/replica3_dnode6.sim @@ -1,18 +1,18 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 + + + + + + + +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/deploy.sh -n dnode6 -i 6 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/metrics/replica3_vnode3.sim b/tests/script/unique/metrics/replica3_vnode3.sim index aee839e80f38b678429d2a095a582332eded8444..379b7357c772b77551626df79548e2a3e961b9ca 100644 --- a/tests/script/unique/metrics/replica3_vnode3.sim +++ b/tests/script/unique/metrics/replica3_vnode3.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/mnode/backup/mgmt44.sim b/tests/script/unique/mnode/backup/mgmt44.sim deleted file mode 100644 index 6eb70c7fb20264967dc2b203f1db8e8235e235e8..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt44.sim +++ /dev/null @@ -1,240 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 4 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start - -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 20 then - return -1 - endi -sql connect -x connectTbase - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi - -print ============================ step5 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step6 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi - -print ============================ step7 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 10000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != undecided then - return -1 -endi - -print ============================ step8 -print ========= drop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role - -if $dnode1Role != null then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt45.sim b/tests/script/unique/mnode/backup/mgmt45.sim deleted file mode 100644 index 53b02847e6d7b6c9bc350c13a23e58d4aa18c3a0..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt45.sim +++ /dev/null @@ -1,336 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 - -system sh/cfg.sh -n dnode1 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode2 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode3 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode4 -c numOfMPeers -v 4 -system sh/cfg.sh -n dnode5 -c numOfMPeers -v 4 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start - -$x = 0 -connectTbase: - $x = $x + 1 - sleep 1000 - if $x == 20 then - return -1 - endi -sql connect -x connectTbase - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step6 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step7 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step8 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 14000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step9 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != null then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt55.sim b/tests/script/unique/mnode/backup/mgmt55.sim deleted file mode 100644 index 0e2b9fa2ef572c64e1af11bb5d67c5ada8c17708..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt55.sim +++ /dev/null @@ -1,328 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 - -system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start -sleep 4000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step6 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step7 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step8 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step9 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != null then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt56.sim b/tests/script/unique/mnode/backup/mgmt56.sim deleted file mode 100644 index 3171ed855d97c6c172902cb6f6f770e4613f5115..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt56.sim +++ /dev/null @@ -1,394 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 - -system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode6 -c tsNumOfMPeers -v 5 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start -sleep 4000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - - -print ============================ step6 -print ========= start dnode6 -system sh/exec.sh -n dnode6 -s start -sql create dnode 192.168.0.6 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != null then - return -1 -endi - -print ============================ step7 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step8 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -print ============================ step9 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -print ============================ step10 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != null then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != master then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/backup/mgmt57.sim b/tests/script/unique/mnode/backup/mgmt57.sim deleted file mode 100644 index 8c6950a8dfbdfe3f2231d61bb0f4df83714bd684..0000000000000000000000000000000000000000 --- a/tests/script/unique/mnode/backup/mgmt57.sim +++ /dev/null @@ -1,408 +0,0 @@ -system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up -system sh/ip.sh -i 6 -s up -system sh/ip.sh -i 7 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 -system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6 -system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7 - -system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode6 -c tsNumOfMPeers -v 5 -system sh/cfg.sh -n dnode7 -c tsNumOfMPeers -v 5 - -print ============================ step1 -print ========= start dnode1 -system sh/exec.sh -n dnode1 -s start -sleep 4000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step2 -print ========= start dnode2 -system sh/exec.sh -n dnode2 -s start -sql create dnode 192.168.0.2 -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != null then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step3 -print ========= start dnode3 -system sh/exec.sh -n dnode3 -s start -sql create dnode 192.168.0.3 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != null then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step4 -print ========= start dnode4 -system sh/exec.sh -n dnode4 -s start -sql create dnode 192.168.0.4 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != null then - return -1 -endi - -print ============================ step5 -print ========= start dnode5 -system sh/exec.sh -n dnode5 -s start -sql create dnode 192.168.0.5 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - - -print ============================ step6 -print ========= start dnode6 -system sh/exec.sh -n dnode6 -s start -sql create dnode 192.168.0.6 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != null then - return -1 -endi - - -print ============================ step7 -print ========= start dnode7 -system sh/exec.sh -n dnode7 -s start -sql create dnode 192.168.0.7 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != slave then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi -if $dnode6Role != null then - return -1 -endi - -print ============================ step8 -print ========= drop dnode2 -sql drop dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode2 -s start - -print ============================ step9 -print ========= create dnode2 -sql create dnode 192.168.0.2 -sleep 6000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != master then - return -1 -endi -if $dnode2Role != null then - return -1 -endi -if $dnode3Role != slave then - return -1 -endi -if $dnode4Role != slave then - return -1 -endi -if $dnode5Role != slave then - return -1 -endi - -print ============================ step10 -print ========= stop dnode1 -system sh/exec.sh -n dnode1 -s stop -sleep 8000 - -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - -if $dnode1Role != undecided then - return -1 -endi -if $dnode3Role != master then - return -1 -endi - -print ============================ step11 -print ========= stop dnode1 -sql drop dnode 192.168.0.1 -sleep 8000 -sql show mnodes -$dnode1Role = $data3_192.168.0.1 -$dnode2Role = $data3_192.168.0.2 -$dnode3Role = $data3_192.168.0.3 -$dnode4Role = $data3_192.168.0.4 -$dnode5Role = $data3_192.168.0.5 -$dnode6Role = $data3_192.168.0.6 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role -print 192.168.0.5 ==> $dnode5Role -print 192.168.0.6 ==> $dnode6Role - - -if $dnode1Role != null then - return -1 -endi -if $dnode3Role != master then - return -1 -endi - -system sh/exec.sh -n dnode1 -s stop -system sh/exec.sh -n dnode2 -s stop -system sh/exec.sh -n dnode3 -s stop -system sh/exec.sh -n dnode4 -s stop -system sh/exec.sh -n dnode5 -s stop -system sh/exec.sh -n dnode6 -s stop -system sh/exec.sh -n dnode7 -s stop \ No newline at end of file diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim index 9081e50ef574bd0a427f2db9c9ca8cf9d5bc2b16..5e2b5623e353683bdf77e28495e17514f508da40 100644 --- a/tests/script/unique/mnode/mgmt22.sim +++ b/tests/script/unique/mnode/mgmt22.sim @@ -1,35 +1,26 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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 numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 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: @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -76,12 +67,12 @@ show6: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show6 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show6 endi @@ -99,13 +90,13 @@ show7: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -print 192.168.0.3 ==> $data3_3 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +print dnode3 ==> $data3_3 +if $data2_1 != master then goto show7 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show7 endi if $data3_3 != null then diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim index c5ab9e27eae538b2211a1d7ad11f900d9116a628..6e2f0c8f56d914002b1e8d5f50334effe2ef249a 100644 --- a/tests/script/unique/mnode/mgmt23.sim +++ b/tests/script/unique/mnode/mgmt23.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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 numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -58,9 +49,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -80,9 +71,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -99,9 +90,8 @@ system sh/exec_up.sh -n dnode2 -s stop print ============== step5 sleep 2000 sql create dnode 192.168.0.2 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 system sh/exec_up.sh -n dnode2 -s start sleep 8000 @@ -109,9 +99,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/mgmt24.sim b/tests/script/unique/mnode/mgmt24.sim index dac3ca4cc0a29909a2c8734f702e0fd1f984a38a..22454c8b5f093419364853e165639523b6926070 100644 --- a/tests/script/unique/mnode/mgmt24.sim +++ b/tests/script/unique/mnode/mgmt24.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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 numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -73,12 +64,12 @@ step5: sql show mnodes -x step5 -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto step5 endi -if $data3_2 != slave then +if $data2_2 != slave then goto step5 endi diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim index 4f5e2bf3c8ad38b22545280a0ea62db8c77bd699..652492db45cfe1060e43c5d7c560f6522d7324b8 100644 --- a/tests/script/unique/mnode/mgmt25.sim +++ b/tests/script/unique/mnode/mgmt25.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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 numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -58,9 +49,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -80,9 +71,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim index 57c600343133980ff95e6558391d2cb2e0b297b7..5ad095db0b61a33190be515f8fd5f8f4b59bd972 100644 --- a/tests/script/unique/mnode/mgmt26.sim +++ b/tests/script/unique/mnode/mgmt26.sim @@ -1,29 +1,20 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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 numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then return -1 endi @@ -40,12 +31,12 @@ show2: endi sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +if $data2_1 != master then goto show2 endi -if $data3_2 != slave then +if $data2_2 != slave then goto show2 endi @@ -58,9 +49,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -81,9 +72,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -97,9 +88,8 @@ endi print ============== step5 system sh/exec_up.sh -n dnode2 -s stop -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 sleep 5000 system sh/exec_up.sh -n dnode2 -s start sql create dnode 192.168.0.2 @@ -109,9 +99,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim index b2235ca6dc93250700b32e2cbf8c7f146827199b..de28dc41a2ad5e38fcc092e73e09ca5aa3c53e35 100644 --- a/tests/script/unique/mnode/mgmt33.sim +++ b/tests/script/unique/mnode/mgmt33.sim @@ -1,30 +1,21 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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 numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -print 192.168.0.3 ==> $data3_3 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +print dnode3 ==> $data3_3 +if $data2_1 != master then return -1 endi if $data3_2 != null then @@ -43,9 +34,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -66,9 +57,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -88,9 +79,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -105,9 +96,8 @@ endi system sh/exec_up.sh -n dnode2 -s stop sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +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 secondIp -v 192.168.0.3 system sh/exec_up.sh -n dnode2 -s start print ============== step5 @@ -118,9 +108,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_4 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -140,9 +130,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_4 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != offline then return -1 @@ -162,9 +152,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != null then return -1 diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim index 1c12b2ee392b6c02e520c06a71e355e7bc311025..2ba090fe9e86392370369abb8d854b34d6ee3dc8 100644 --- a/tests/script/unique/mnode/mgmt34.sim +++ b/tests/script/unique/mnode/mgmt34.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3 @@ -21,10 +21,10 @@ sleep 3000 sql connect sql show mnodes -print 192.168.0.1 ==> $data3_1 -print 192.168.0.2 ==> $data3_2 -print 192.168.0.3 ==> $data3_3 -if $data3_1 != master then +print dnode1 ==> $data2_1 +print dnode2 ==> $data2_2 +print dnode3 ==> $data3_3 +if $data2_1 != master then return -1 endi if $data3_2 != null then @@ -44,10 +44,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -72,10 +72,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -101,10 +101,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -128,10 +128,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -149,9 +149,8 @@ endi system sh/exec_up.sh -n dnode2 -s stop sleep 3000 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 +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 secondIp -v 192.168.0.3 system sh/exec_up.sh -n dnode2 -s start print ============== step6 @@ -163,10 +162,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != master then return -1 @@ -190,10 +189,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != offline then return -1 @@ -208,10 +207,10 @@ $dnode1Role = $data3_1 $dnode2Role = $data3_5 $dnode3Role = $data3_3 $dnode4Role = $data3_4 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role -print 192.168.0.4 ==> $dnode4Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role +print dnode4 ==> $dnode4Role if $dnode1Role != null then return -1 diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim index 666b8a7b3343453fede4623538f405ad5e264a55..60907c90baf1d7d1abc04d1b82967564ba49839e 100644 --- a/tests/script/unique/mnode/mgmtr2.sim +++ b/tests/script/unique/mnode/mgmtr2.sim @@ -1,21 +1,12 @@ system sh/stop_dnodes.sh - -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 +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 numOfMPeers -v 2 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2 -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.3 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3 -system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.3 - print ============== step1 system sh/exec_up.sh -n dnode1 -s start sql connect @@ -25,9 +16,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 @@ -70,9 +61,9 @@ sql show mnodes $dnode1Role = $data3_1 $dnode2Role = $data3_2 $dnode3Role = $data3_3 -print 192.168.0.1 ==> $dnode1Role -print 192.168.0.2 ==> $dnode2Role -print 192.168.0.3 ==> $dnode3Role +print dnode1 ==> $dnode1Role +print dnode2 ==> $dnode2Role +print dnode3 ==> $dnode3Role if $dnode1Role != master then return -1 diff --git a/tests/script/unique/mnode/secondIp.sim b/tests/script/unique/mnode/secondIp.sim index 6902c7d49843079a63018c918f7e76aeff1ecb4f..ae339c3d21de803b8e6ba3c8a78608a9c91a9aee 100644 --- a/tests/script/unique/mnode/secondIp.sim +++ b/tests/script/unique/mnode/secondIp.sim @@ -1,10 +1,6 @@ system sh/stop_dnodes.sh - -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2 - -system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.1 -system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.1 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 print ========== step1 dnode2 start system sh/exec_up.sh -n dnode2 -s start @@ -17,10 +13,10 @@ sleep 3000 print ========== step3 sql show dnodes -print 192.168.0.1 openvnodes $data3_1 -print 192.168.0.2 openvnodes $data3_2 -print 192.168.0.1 totalvnodes $data4_1 -print 192.168.0.2 totalvnodes $data4_2 +print dnode1 openvnodes $data3_1 +print dnode2 openvnodes $data3_2 +print dnode1 totalvnodes $data4_1 +print dnode2 totalvnodes $data4_2 if $rows != 2 then return -1 diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim index 9efb32060c563000354acacee56df49d86fe793e..86137f8d1351f5edbd8fd9206ac91594df808e47 100644 --- a/tests/script/unique/stream/metrics_balance.sim +++ b/tests/script/unique/stream/metrics_balance.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 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 @@ -189,9 +189,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 @@ -214,9 +214,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show2 diff --git a/tests/script/unique/stream/metrics_replica1_dnode2.sim b/tests/script/unique/stream/metrics_replica1_dnode2.sim index e55ffbefd76f047906cb3d1d529064244bd28741..c2a3c813c322d556cd83090f2ea8b224a5a93c53 100644 --- a/tests/script/unique/stream/metrics_replica1_dnode2.sim +++ b/tests/script/unique/stream/metrics_replica1_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/metrics_replica2_dnode2.sim b/tests/script/unique/stream/metrics_replica2_dnode2.sim index a3bcd45048e3018392dc07bc312eca006beaceb5..d5631be8d46620872a2fa25fb13820119dc46845 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode2.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim index 3731df7f27559bfd28fdd919d91ad58322bb6220..6e3baf424c6835abad13cbc7679a8727601270c7 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/metrics_replica2_dnode3.sim b/tests/script/unique/stream/metrics_replica2_dnode3.sim index 092232b0611a8fa594f05c3f6a7e178a41c01eb5..a5756e711c4c7c494c1463181587b1213a5dd906 100644 --- a/tests/script/unique/stream/metrics_replica2_dnode3.sim +++ b/tests/script/unique/stream/metrics_replica2_dnode3.sim @@ -1,11 +1,11 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/metrics_replica3_dnode4.sim b/tests/script/unique/stream/metrics_replica3_dnode4.sim index 900e26f8daa725157cd035385107cb59a99c4e7b..7451347186178a2a076f11fddf0f4974246c59f0 100644 --- a/tests/script/unique/stream/metrics_replica3_dnode4.sim +++ b/tests/script/unique/stream/metrics_replica3_dnode4.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/metrics_vnode_stop.sim b/tests/script/unique/stream/metrics_vnode_stop.sim index 47eff851d769faec9ab48928f582768f5082754f..20236276ea7aece0887a46cf82bf297f1c5a7e7e 100644 --- a/tests/script/unique/stream/metrics_vnode_stop.sim +++ b/tests/script/unique/stream/metrics_vnode_stop.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 @@ -97,8 +97,8 @@ print ============= step6 sql close system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode2 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/exec.sh -n dnode2 -s start diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim index 4b77f2518963a7abbf5bc82aa313989771c47d4b..9bf9b9ed47036232952436093d1745ecbb85920d 100644 --- a/tests/script/unique/stream/table_balance.sim +++ b/tests/script/unique/stream/table_balance.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 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 @@ -124,9 +124,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 0 then goto show1 @@ -149,9 +149,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 2 then goto show2 diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim index 3a4c1c976f5d2a696419c1aab6a8b6f8a78b4036..fd03426dd55e5458404fc0ad513d7d2ffad61f91 100644 --- a/tests/script/unique/stream/table_move.sim +++ b/tests/script/unique/stream/table_move.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +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 numOfTotalVnodes -v 8 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8 @@ -161,9 +161,9 @@ show1: endi sql show dnodes -x show1 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 6 then goto show1 @@ -186,9 +186,9 @@ show2: endi sql show dnodes -x show2 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != 7 then goto show2 @@ -215,9 +215,9 @@ show6: endi sql show dnodes -x show6 $dnode1Vnodes = $data3_192.168.0.1 -print 192.168.0.1 $dnode1Vnodes +print dnode1 $dnode1Vnodes $dnode2Vnodes = $data3_192.168.0.2 -print 192.168.0.2 $dnode2Vnodes +print dnode2 $dnode2Vnodes if $dnode1Vnodes != null then goto show6 diff --git a/tests/script/unique/stream/table_replica1_dnode2.sim b/tests/script/unique/stream/table_replica1_dnode2.sim index 516573253577006407daa2154eddb970d6dc8484..f087b815feaf614da4c55f79eeba504aaff36f7d 100644 --- a/tests/script/unique/stream/table_replica1_dnode2.sim +++ b/tests/script/unique/stream/table_replica1_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/table_replica2_dnode2.sim b/tests/script/unique/stream/table_replica2_dnode2.sim index 177d2ec3445850e09703683234404b04b52a4511..d35039f61754370ad0647ee20e427f272d4f2c3a 100644 --- a/tests/script/unique/stream/table_replica2_dnode2.sim +++ b/tests/script/unique/stream/table_replica2_dnode2.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/exec.sh -n dnode1 -s start diff --git a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim index ace39d0604a98dcd9d2cb4fdf089522aaa6c00fa..581a4ab06b3472fe925e5b04e33dba9883e2528c 100644 --- a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim +++ b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8 diff --git a/tests/script/unique/stream/table_replica2_dnode3.sim b/tests/script/unique/stream/table_replica2_dnode3.sim index 658a3dd00c0b0b9400ce094a4f0a9cc13199a393..302b006b21af115e16dae317d702b029ebbc28d2 100644 --- a/tests/script/unique/stream/table_replica2_dnode3.sim +++ b/tests/script/unique/stream/table_replica2_dnode3.sim @@ -1,11 +1,11 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/table_replica3_dnode4.sim b/tests/script/unique/stream/table_replica3_dnode4.sim index 60cab2574e9955133a05680dc6722bd9a07db92b..5fbd27ad42f5398b7450c51cead9377b5c2a3aec 100644 --- a/tests/script/unique/stream/table_replica3_dnode4.sim +++ b/tests/script/unique/stream/table_replica3_dnode4.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/stream/table_vnode_stop.sim b/tests/script/unique/stream/table_vnode_stop.sim index c4548dda5903587393e6298fe0860703048e8901..05ad2d6a5ff5292e507e5b19068298345390cd8c 100644 --- a/tests/script/unique/stream/table_vnode_stop.sim +++ b/tests/script/unique/stream/table_vnode_stop.sim @@ -1,9 +1,9 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2 @@ -98,8 +98,8 @@ print ============= step6 sql close system sh/exec.sh -n dnode1 -s stop system sh/exec.sh -n dnode2 -s stop -system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2 +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 sleep 2000 diff --git a/tests/script/unique/table/delete_part.sim b/tests/script/unique/table/delete_part.sim index dae57366d0cf3d3943a219add89b6a1ee7ab2f5c..189bd6c43182b747093e41fd83b4105c56789ba3 100644 --- a/tests/script/unique/table/delete_part.sim +++ b/tests/script/unique/table/delete_part.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/backup/replica4.sim b/tests/script/unique/vnode/backup/replica4.sim index c6eeeca58fd31ac27eeeab01030dd05cd92d053d..5334b21d53c3a5658db5deb50e145dac2948189f 100644 --- a/tests/script/unique/vnode/backup/replica4.sim +++ b/tests/script/unique/vnode/backup/replica4.sim @@ -1,14 +1,14 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/backup/replica5.sim b/tests/script/unique/vnode/backup/replica5.sim index 3a4f28bdc234c9c1b1ea9321074cdb77705c7d11..e2e45c0e259bafefe530788623d419bf21ffb00b 100644 --- a/tests/script/unique/vnode/backup/replica5.sim +++ b/tests/script/unique/vnode/backup/replica5.sim @@ -1,16 +1,16 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/ip.sh -i 5 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 -system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5 + + + + + + +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 commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/commit.sim b/tests/script/unique/vnode/commit.sim index 572f4e08ece5dec8e3a1c3936cbaaeba401d29e8..67f6f027b8033fd790e121b98fa648c8c34dd416 100644 --- a/tests/script/unique/vnode/commit.sim +++ b/tests/script/unique/vnode/commit.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim index b5b87fc10854f7a331203654da6aaf79632109d4..ca1475190c14c9c8a746910f09d950726c7723de 100644 --- a/tests/script/unique/vnode/many.sim +++ b/tests/script/unique/vnode/many.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica2_basic.sim b/tests/script/unique/vnode/replica2_basic.sim index 647d692e8e04cd9b503a90dcd30569aeec036640..29268737500a815783f38ab2c720beb3acfb71b8 100644 --- a/tests/script/unique/vnode/replica2_basic.sim +++ b/tests/script/unique/vnode/replica2_basic.sim @@ -1,8 +1,8 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3 @@ -120,7 +120,7 @@ endi print =================== step 8 system sh/ip.sh -i 1 -s down -system sh/ip.sh -i 2 -s up + sleep 2000 $y = $x + $N $expect = $N * 6 @@ -137,7 +137,7 @@ if $rows != $expect then endi print =================== step 9 -system sh/ip.sh -i 2 -s up + sleep 2000 $y = $x + $N $expect = $N * 7 @@ -155,7 +155,7 @@ endi print =================== step 10 system sh/ip.sh -i 2 -s down -system sh/ip.sh -i 1 -s up + sleep 2000 $y = $x + $N $expect = $N * 8 @@ -172,7 +172,7 @@ if $rows != $expect then endi print =================== step 11 -system sh/ip.sh -i 2 -s up + sleep 2000 $y = $x + $N $expect = $N * 9 diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim index 9eb6b4a6ac185b4f618009c60a8fbf39580fe50a..0380dfa58870285fc7fc426fd5a8a88527e91307 100644 --- a/tests/script/unique/vnode/replica2_basic2.sim +++ b/tests/script/unique/vnode/replica2_basic2.sim @@ -1,13 +1,13 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up - -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim index 9d7caacb5967868da25a3b4beb2493926a3fb175..d8d5c4089eeaece651eb14dae672284f107003ce 100644 --- a/tests/script/unique/vnode/replica2_repeat.sim +++ b/tests/script/unique/vnode/replica2_repeat.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica3_basic.sim b/tests/script/unique/vnode/replica3_basic.sim index b401e5fc4bc0a7b5277d71aba838a84976b0b749..858c570fc43d21fadf6047a63fb9d33ebd6028f2 100644 --- a/tests/script/unique/vnode/replica3_basic.sim +++ b/tests/script/unique/vnode/replica3_basic.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim index 299036dace495475580c4c10777aaa4f9509d911..afdcda0dcffc8eddcaaeae59e5da97383d089037 100644 --- a/tests/script/unique/vnode/replica3_repeat.sim +++ b/tests/script/unique/vnode/replica3_repeat.sim @@ -1,12 +1,12 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/ip.sh -i 4 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 -system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4 + + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 +system sh/deploy.sh -n dnode4 -i 4 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim index a88c6854be94cc5b41a67f824d2b12e736f5cf41..50fa40629dd0cc5e808c22b80d751162cf8609fe 100644 --- a/tests/script/unique/vnode/replica3_vgroup.sim +++ b/tests/script/unique/vnode/replica3_vgroup.sim @@ -1,10 +1,10 @@ system sh/stop_dnodes.sh -system sh/ip.sh -i 1 -s up -system sh/ip.sh -i 2 -s up -system sh/ip.sh -i 3 -s up -system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 -system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2 -system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3 + + + +system sh/deploy.sh -n dnode1 -i 1 +system sh/deploy.sh -n dnode2 -i 2 +system sh/deploy.sh -n dnode3 -i 3 system sh/cfg.sh -n dnode1 -c commitLog -v 0 system sh/cfg.sh -n dnode2 -c commitLog -v 0 system sh/cfg.sh -n dnode3 -c commitLog -v 0 diff --git a/tests/test/c/importOneRow.c b/tests/test/c/importOneRow.c index 25eeb0b3926bced56b4a31ddcafcc7e1a3101c69..902cf46c3ad0ce6970abe3f67a47c07f6d5528c8 100644 --- a/tests/test/c/importOneRow.c +++ b/tests/test/c/importOneRow.c @@ -107,7 +107,7 @@ void* taos_execute(void *param) { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); void *taos = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (taos == NULL) taos_error(taos); diff --git a/tests/test/c/importPerTabe.c b/tests/test/c/importPerTabe.c index e53707c55f708de20b12f11aeb1e3d46e47296db..15b3fc2572e69a0894bc0f6ed6a90cf7af278a73 100644 --- a/tests/test/c/importPerTabe.c +++ b/tests/test/c/importPerTabe.c @@ -71,7 +71,7 @@ void createDbAndTable() { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { @@ -198,7 +198,7 @@ void *syncTest(void *param) { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { diff --git a/tests/test/c/insertPerRow.c b/tests/test/c/insertPerRow.c index 7d17283b8847e6e6c644d92812eea821f4964d1c..6b5a6780938f534ffc1bcab2618301350c6c09e4 100644 --- a/tests/test/c/insertPerRow.c +++ b/tests/test/c/insertPerRow.c @@ -70,7 +70,7 @@ void createDbAndTable() { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("failed to connect to DB, reason:%s", taos_errstr(con)); @@ -197,7 +197,7 @@ void *syncTest(void *param) { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con)); diff --git a/tests/test/c/insertPerTable.c b/tests/test/c/insertPerTable.c index e280a728547aac4785135f277b1adc588714f0b6..a439abec881d21a7d2a1ae51e701f0da59afed44 100644 --- a/tests/test/c/insertPerTable.c +++ b/tests/test/c/insertPerTable.c @@ -71,7 +71,7 @@ void createDbAndTable() { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) { @@ -199,7 +199,7 @@ void *syncTest(void *param) { char fqdn[TSDB_FQDN_LEN]; uint16_t port; - taosGetFqdnPortFromEp(tsMaster, fqdn, &port); + taosGetFqdnPortFromEp(tsFirst, fqdn, &port); con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port); if (con == NULL) {