commit
8ffe4b7655
|
@ -150,7 +150,7 @@ cd ../../../debug; make
|
||||||
#./test.sh -f general/parser/bug.sim
|
#./test.sh -f general/parser/bug.sim
|
||||||
|
|
||||||
./test.sh -f general/stable/disk.sim
|
./test.sh -f general/stable/disk.sim
|
||||||
#./test.sh -f general/stable/dnode3.sim
|
#liao ./test.sh -f general/stable/dnode3.sim
|
||||||
./test.sh -f general/stable/metrics.sim
|
./test.sh -f general/stable/metrics.sim
|
||||||
./test.sh -f general/stable/values.sim
|
./test.sh -f general/stable/values.sim
|
||||||
./test.sh -f general/stable/vnode3.sim
|
./test.sh -f general/stable/vnode3.sim
|
||||||
|
@ -252,23 +252,23 @@ cd ../../../debug; make
|
||||||
|
|
||||||
./test.sh -u -f unique/column/replica3.sim
|
./test.sh -u -f unique/column/replica3.sim
|
||||||
|
|
||||||
#hongze crash ./test.sh -u -f unique/db/commit.sim
|
#liao wait ./test.sh -u -f unique/db/commit.sim
|
||||||
./test.sh -u -f unique/db/delete.sim
|
./test.sh -u -f unique/db/delete.sim
|
||||||
./test.sh -u -f unique/db/delete_part.sim
|
./test.sh -u -f unique/db/delete_part.sim
|
||||||
./test.sh -u -f unique/db/replica_add12.sim
|
./test.sh -u -f unique/db/replica_add12.sim
|
||||||
#hongze crash ./test.sh -u -f unique/db/replica_add13.sim
|
#hongze ./test.sh -u -f unique/db/replica_add13.sim
|
||||||
#hongze crash ./test.sh -u -f unique/db/replica_add23.sim
|
#hongze wait ./test.sh -u -f unique/db/replica_add23.sim
|
||||||
#hongze crash ./test.sh -u -f unique/db/replica_reduce21.sim
|
#hongze wait ./test.sh -u -f unique/db/replica_reduce21.sim
|
||||||
./test.sh -u -f unique/db/replica_reduce32.sim
|
./test.sh -u -f unique/db/replica_reduce32.sim
|
||||||
#hongze crash /test.sh -u -f unique/db/replica_reduce31.sim
|
#hongze wait /test.sh -u -f unique/db/replica_reduce31.sim
|
||||||
./test.sh -u -f unique/db/replica_part.sim
|
./test.sh -u -f unique/db/replica_part.sim
|
||||||
|
|
||||||
##./test.sh -u -f unique/dnode/balance1.sim
|
./test.sh -u -f unique/dnode/balance1.sim
|
||||||
##./test.sh -u -f unique/dnode/balance2.sim
|
./test.sh -u -f unique/dnode/balance2.sim
|
||||||
##./test.sh -u -f unique/dnode/balance3.sim
|
./test.sh -u -f unique/dnode/balance3.sim
|
||||||
##./test.sh -u -f unique/dnode/balancex.sim
|
./test.sh -u -f unique/dnode/balancex.sim
|
||||||
##./test.sh -u -f unique/dnode/offline1.sim
|
./test.sh -u -f unique/dnode/offline1.sim
|
||||||
##./test.sh -u -f unique/dnode/offline2.sim
|
#hongze wait ./test.sh -u -f unique/dnode/offline2.sim
|
||||||
./test.sh -u -f unique/dnode/remove1.sim
|
./test.sh -u -f unique/dnode/remove1.sim
|
||||||
#hongze ./test.sh -u -f unique/dnode/remove2.sim
|
#hongze ./test.sh -u -f unique/dnode/remove2.sim
|
||||||
./test.sh -u -f unique/dnode/vnode_clean.sim
|
./test.sh -u -f unique/dnode/vnode_clean.sim
|
||||||
|
@ -276,17 +276,17 @@ cd ../../../debug; make
|
||||||
./test.sh -u -f unique/http/admin.sim
|
./test.sh -u -f unique/http/admin.sim
|
||||||
./test.sh -u -f unique/http/opentsdb.sim
|
./test.sh -u -f unique/http/opentsdb.sim
|
||||||
|
|
||||||
#./test.sh -u -f unique/import/replica2.sim
|
#liao wait ./test.sh -u -f unique/import/replica2.sim
|
||||||
#./test.sh -u -f unique/import/replica3.sim
|
#liao wait ./test.sh -u -f unique/import/replica3.sim
|
||||||
|
|
||||||
#./test.sh -u -f unique/stable/balance_replica1.sim
|
#liao wait ./test.sh -u -f unique/stable/balance_replica1.sim
|
||||||
#./test.sh -u -f unique/stable/dnode2_stop.sim
|
#liao wait ./test.sh -u -f unique/stable/dnode2_stop.sim
|
||||||
#./test.sh -u -f unique/stable/dnode2.sim
|
#liao wait ./test.sh -u -f unique/stable/dnode2.sim
|
||||||
#./test.sh -u -f unique/stable/dnode3.sim
|
#liao wait ./test.sh -u -f unique/stable/dnode3.sim
|
||||||
#./test.sh -u -f unique/stable/replica2_dnode4.sim
|
#liao wait ./test.sh -u -f unique/stable/replica2_dnode4.sim
|
||||||
#./test.sh -u -f unique/stable/replica2_vnode3.sim
|
#liao wait ./test.sh -u -f unique/stable/replica2_vnode3.sim
|
||||||
#./test.sh -u -f unique/stable/replica3_dnode6.sim
|
#liao wait ./test.sh -u -f unique/stable/replica3_dnode6.sim
|
||||||
#./test.sh -u -f unique/stable/replica3_vnode3.sim
|
#liao wait ./test.sh -u -f unique/stable/replica3_vnode3.sim
|
||||||
|
|
||||||
./test.sh -u -f unique/mnode/mgmt22.sim
|
./test.sh -u -f unique/mnode/mgmt22.sim
|
||||||
./test.sh -u -f unique/mnode/mgmt23.sim
|
./test.sh -u -f unique/mnode/mgmt23.sim
|
||||||
|
|
|
@ -179,21 +179,25 @@ sql insert into d3.t3 values(now, 4)
|
||||||
sql insert into d4.t4 values(now, 4)
|
sql insert into d4.t4 values(now, 4)
|
||||||
|
|
||||||
sql select * from d1.t1
|
sql select * from d1.t1
|
||||||
|
print select * from d1.t1 $rows
|
||||||
if $rows != 4 then
|
if $rows != 4 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
sql select * from d2.t2
|
sql select * from d2.t2
|
||||||
|
print select * from d2.t2 $rows
|
||||||
if $rows != 4 then
|
if $rows != 4 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
sql select * from d3.t3
|
sql select * from d3.t3
|
||||||
|
print select * from d3.t3 $rows
|
||||||
if $rows != 4 then
|
if $rows != 4 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
sql select * from d4.t4
|
sql select * from d4.t4
|
||||||
|
print select * from d4.t4 $rows
|
||||||
if $rows != 4 then
|
if $rows != 4 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
|
@ -53,7 +53,7 @@ $x = 0
|
||||||
show2:
|
show2:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ $x = 0
|
||||||
show4:
|
show4:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ print dnode2 openVnodes $data2_2
|
||||||
if $data2_1 != 2 then
|
if $data2_1 != 2 then
|
||||||
goto show4
|
goto show4
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show4
|
goto show4
|
||||||
endi
|
endi
|
||||||
if $rows != 1 then
|
if $rows != 1 then
|
||||||
|
@ -131,7 +131,7 @@ print dnode3 openVnodes $data2_3
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
goto show5
|
goto show5
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show5
|
goto show5
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 2 then
|
if $data2_3 != 2 then
|
||||||
|
@ -155,7 +155,7 @@ print dnode3 openVnodes $data2_3
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 3 then
|
if $data2_3 != 3 then
|
||||||
|
@ -170,7 +170,7 @@ $x = 0
|
||||||
show7:
|
show7:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
|
@ -182,7 +182,7 @@ print dnode4 openVnodes $data2_4
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
goto show7
|
goto show7
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show7
|
goto show7
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 2 then
|
if $data2_3 != 2 then
|
||||||
|
@ -210,7 +210,7 @@ print dnode4 openVnodes $data2_4
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 2 then
|
if $data2_3 != 2 then
|
||||||
|
@ -227,7 +227,7 @@ $x = 0
|
||||||
show9:
|
show9:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
|
@ -240,10 +240,10 @@ print dnode4 openVnodes $data2_4
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
goto show9
|
goto show9
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show9
|
goto show9
|
||||||
endi
|
endi
|
||||||
if $data2_3 != NULL then
|
if $data2_3 != null then
|
||||||
goto show9
|
goto show9
|
||||||
endi
|
endi
|
||||||
if $data2_4 != 4 then
|
if $data2_4 != 4 then
|
||||||
|
|
|
@ -65,7 +65,7 @@ $x = 0
|
||||||
show2:
|
show2:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ print dnode3 openVnodes $data2_3
|
||||||
if $data2_1 != 2 then
|
if $data2_1 != 2 then
|
||||||
goto show2
|
goto show2
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show2
|
goto show2
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 2 then
|
if $data2_3 != 2 then
|
||||||
|
@ -105,7 +105,7 @@ print dnode4 openVnodes $data2_4
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
goto show3
|
goto show3
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show3
|
goto show3
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 2 then
|
if $data2_3 != 2 then
|
||||||
|
@ -132,7 +132,7 @@ print dnode4 openVnodes $data2_4
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 3 then
|
if $data2_3 != 3 then
|
||||||
|
@ -150,7 +150,7 @@ $x = 0
|
||||||
show5:
|
show5:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
|
@ -163,7 +163,7 @@ print dnode5 openVnodes $data2_5
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
goto show5
|
goto show5
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show5
|
goto show5
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 2 then
|
if $data2_3 != 2 then
|
||||||
|
@ -183,7 +183,7 @@ $x = 0
|
||||||
show6:
|
show6:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
|
@ -196,10 +196,10 @@ print dnode5 openVnodes $data2_5
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
goto show6
|
goto show6
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show6
|
goto show6
|
||||||
endi
|
endi
|
||||||
if $data2_3 != NULL then
|
if $data2_3 != null then
|
||||||
goto show6
|
goto show6
|
||||||
endi
|
endi
|
||||||
if $data2_4 != 3 then
|
if $data2_4 != 3 then
|
||||||
|
|
|
@ -88,7 +88,7 @@ print dnode4 openVnodes $data2_4
|
||||||
if $data2_1 != 2 then
|
if $data2_1 != 2 then
|
||||||
goto show2
|
goto show2
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show2
|
goto show2
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 2 then
|
if $data2_3 != 2 then
|
||||||
|
@ -122,7 +122,7 @@ print dnode5 openVnodes $data2_5
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
goto show3
|
goto show3
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show3
|
goto show3
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 2 then
|
if $data2_3 != 2 then
|
||||||
|
@ -162,7 +162,7 @@ print dnode5 openVnodes $data2_5
|
||||||
if $data2_1 != 0 then
|
if $data2_1 != 0 then
|
||||||
goto show4
|
goto show4
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show4
|
goto show4
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 3 then
|
if $data2_3 != 3 then
|
||||||
|
@ -228,7 +228,7 @@ endi
|
||||||
if $data2_6 != 3 then
|
if $data2_6 != 3 then
|
||||||
goto show6
|
goto show6
|
||||||
endi
|
endi
|
||||||
if $data2_3 != NULL then
|
if $data2_3 != null then
|
||||||
goto show6
|
goto show6
|
||||||
endi
|
endi
|
||||||
if $data2_4 != 3 then
|
if $data2_4 != 3 then
|
||||||
|
|
|
@ -50,7 +50,7 @@ $x = 0
|
||||||
show2:
|
show2:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ $x = 0
|
||||||
show3:
|
show3:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
sql show dnodes
|
sql show dnodes
|
||||||
|
@ -122,7 +122,7 @@ $x = 0
|
||||||
show5:
|
show5:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 2000
|
sleep 2000
|
||||||
if $x == 30 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
sql show dnodes
|
sql show dnodes
|
||||||
|
@ -132,7 +132,7 @@ print dnode3 openVnodes $data2_3
|
||||||
if $data2_1 != 1 then
|
if $data2_1 != 1 then
|
||||||
goto show5
|
goto show5
|
||||||
endi
|
endi
|
||||||
if $data2_2 != NULL then
|
if $data2_2 != null then
|
||||||
goto show5
|
goto show5
|
||||||
endi
|
endi
|
||||||
if $data2_3 != 3 then
|
if $data2_3 != 3 then
|
||||||
|
|
|
@ -63,7 +63,7 @@ print dnode1 $data4_2
|
||||||
if $data4_1 != ready then
|
if $data4_1 != ready then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
if $data4_2 != NULL then
|
if $data4_2 != null then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
|
|
|
@ -82,15 +82,18 @@ $x = 0
|
||||||
show4:
|
show4:
|
||||||
$x = $x + 1
|
$x = $x + 1
|
||||||
sleep 5000
|
sleep 5000
|
||||||
if $x == 50 then
|
if $x == 10 then
|
||||||
return -1
|
return -1
|
||||||
endi
|
endi
|
||||||
|
|
||||||
sql show dnodes
|
sql show dnodes
|
||||||
|
print dnode1 $data4_1
|
||||||
|
print dnode2 $data4_2
|
||||||
|
print dnode3 $data4_3
|
||||||
if $data4_1 != ready then
|
if $data4_1 != ready then
|
||||||
goto show4
|
goto show4
|
||||||
endi
|
endi
|
||||||
if $data4_2 != NULL then
|
if $data4_2 != null then
|
||||||
goto show4
|
goto show4
|
||||||
endi
|
endi
|
||||||
if $data4_3 != ready then
|
if $data4_3 != ready then
|
||||||
|
|
|
@ -77,11 +77,11 @@ if $rows != 3 then
|
||||||
endi
|
endi
|
||||||
|
|
||||||
sql show dnodes
|
sql show dnodes
|
||||||
$dnode1Vnodes = $data3_192.168.0.1
|
$dnode1Vnodes = $data2_1
|
||||||
print dnode1 $dnode1Vnodes
|
print dnode1 $dnode1Vnodes
|
||||||
$dnode2Vnodes = $data3_192.168.0.2
|
$dnode2Vnodes = $data2_2
|
||||||
print dnode2 $dnode2Vnodes
|
print dnode2 $dnode2Vnodes
|
||||||
$dnode3Vnodes = $data3_192.168.0.3
|
$dnode3Vnodes = $data2_3
|
||||||
print dnode3 $dnode3Vnodes
|
print dnode3 $dnode3Vnodes
|
||||||
|
|
||||||
if $dnode1Vnodes != 3 then
|
if $dnode1Vnodes != 3 then
|
||||||
|
|
Loading…
Reference in New Issue