gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix loading race in psync2 tests

Browse Source
This commit is contained in:
Oran Agra 2020-04-28 09:18:01 +03:00
parent bee51ef883
commit a29e617381
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/integration/psync2-pingoff.tcl
View File

@ -20,6 +20,7 @@ start_server {} {
$R(1) replicaof $R_host(0) $R_port(0) $R(1) replicaof $R_host(0) $R_port(0)
$R(0) set foo bar $R(0) set foo bar
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[status $R(1) master_link_status] == "up" &&
[$R(0) dbsize] == 1 && [$R(1) dbsize] == 1 [$R(0) dbsize] == 1 && [$R(1) dbsize] == 1
} else { } else {
fail "Replicas not replicating from master" fail "Replicas not replicating from master"

5
tests/integration/psync2-reg.tcl
View File

@ -28,7 +28,10 @@ start_server {} {
$R(2) slaveof $R_host(0) $R_port(0) $R(2) slaveof $R_host(0) $R_port(0)
$R(0) set foo bar $R(0) set foo bar
wait_for_condition 50 1000 { wait_for_condition 50 1000 {
[$R(1) dbsize] == 1 && [$R(2) dbsize] == 1 [status $R(1) master_link_status] == "up" &&
[status $R(2) master_link_status] == "up" &&
[$R(1) dbsize] == 1 &&
[$R(2) dbsize] == 1
} else { } else {
fail "Replicas not replicating from master" fail "Replicas not replicating from master"
} }

10
tests/integration/psync2.tcl
View File

@ -67,6 +67,16 @@ start_server {} {
lappend used $slave_id lappend used $slave_id
} }
# Wait for replicas to sync. so next loop won't get -LOADING error
wait_for_condition 50 1000 {
[status $R([expr {($master_id+1)%5}]) master_link_status] == "up" &&
[status $R([expr {($master_id+2)%5}]) master_link_status] == "up" &&
[status $R([expr {($master_id+3)%5}]) master_link_status] == "up" &&
[status $R([expr {($master_id+4)%5}]) master_link_status] == "up"
} else {
fail "Replica not reconnecting"
}
# 3) Increment the counter and wait for all the instances # 3) Increment the counter and wait for all the instances
# to converge. # to converge.
test "PSYNC2: cluster is consistent after failover" { test "PSYNC2: cluster is consistent after failover" {