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

Don't start multimaster tests until all nodes are connected

Browse Source 
Former-commit-id: 202b97eff76501e736a2f0969607e3297e9703a4
This commit is contained in:
John Sully 2020-05-31 22:50:30 -04:00
parent 4b08ccd0b1
commit eddc1ad46a
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server.cpp
View File

@ -4640,8 +4640,17 @@ sds genRedisInfoString(const char *section) {
listIter li; listIter li;
listNode *ln; listNode *ln;
listRewind(g_pserver->masters, &li); listRewind(g_pserver->masters, &li);
bool fAllUp = true;
while ((ln = listNext(&li))) {
redisMaster *mi = (redisMaster*)listNodeValue(ln);
fAllUp = fAllUp && mi->repl_state == REPL_STATE_CONNECTED;
}
sdscatprintf(info, "all_master_link_status:%s\r\n",
fAllUp ? "up" : "down");
int cmasters = 0; int cmasters = 0;
listRewind(g_pserver->masters, &li);
while ((ln = listNext(&li))) while ((ln = listNext(&li)))
{ {
long long slave_repl_offset = 1; long long slave_repl_offset = 1;

21
tests/integration/replication-multimaster.tcl
View File

@ -31,13 +31,21 @@ start_server {overrides {hz 500 active-replica yes multi-master yes}} {
$R(3) replicaof $R_host(2) $R_port(2) $R(3) replicaof $R_host(2) $R_port(2)
} }
after 2000 test "$topology all nodes up" {
for {set j 0} {$j < 4} {incr j} {
wait_for_condition 50 100 {
[string match {*all_master_link_status:up*} [$R($j) info replication]]
} else {
fail "Multimaster group didn't connect up in a reasonable period of time"
}
}
}
test "$topology replicates to all nodes" { test "$topology replicates to all nodes" {
$R(0) set testkey foo $R(0) set testkey foo
after 500 after 500
for {set n 0} {$n < 4} {incr n} { for {set n 0} {$n < 4} {incr n} {
wait_for_condition 50 1000 { wait_for_condition 50 100 {
[$R($n) get testkey] == "foo" [$R($n) get testkey] == "foo"
} else { } else {
fail "Failed to replicate to $n" fail "Failed to replicate to $n"
@ -48,12 +56,17 @@ start_server {overrides {hz 500 active-replica yes multi-master yes}} {
test "$topology replicates only once" { test "$topology replicates only once" {
$R(0) set testkey 1 $R(0) set testkey 1
after 500 after 500
#wait_for_condition 50 100 {
# [$R(1) get testkey] == 1 && [$R(2) get testkey] == 1
#} else {
# fail "Set failed to replicate"
#}
$R(1) incr testkey $R(1) incr testkey
after 500 after 500
$R(2) incr testkey $R(2) incr testkey
after 500 after 500
for {set n 0} {$n < 4} {incr n} { for {set n 0} {$n < 4} {incr n} {
wait_for_condition 50 1000 { wait_for_condition 100 100 {
[$R($n) get testkey] == 3 [$R($n) get testkey] == 3
} else { } else {
fail "node $n did not replicate" fail "node $n did not replicate"
@ -69,7 +82,7 @@ start_server {overrides {hz 500 active-replica yes multi-master yes}} {
$R(0) incr testkey $R(0) incr testkey
$R(0) exec $R(0) exec
for {set n 0} {$n < 4} {incr n} { for {set n 0} {$n < 4} {incr n} {
wait_for_condition 50 1000 { wait_for_condition 50 100 {
[$R($n) get testkey] == 3 [$R($n) get testkey] == 3
} else { } else {
fail "node $n failed to replicate" fail "node $n failed to replicate"