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

Test: regression for issue #2473.

Browse Source
This commit is contained in:
antirez 2015-03-27 12:10:46 +01:00
parent 068d3c9737
commit 37260bc3be
1 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tests/integration/replication.tcl
View File

@ -1,10 +1,17 @@
start_server {tags {"repl"}} { start_server {tags {"repl"}} {
set A [srv 0 client]
set A_host [srv 0 host]
set A_port [srv 0 port]
start_server {} { start_server {} {
test {First server should have role slave after SLAVEOF} { set B [srv 0 client]
r -1 slaveof [srv 0 host] [srv 0 port] set B_host [srv 0 host]
set B_port [srv 0 port]
test {Set instance A as slave of B} {
$A slaveof $B_host $B_port
wait_for_condition 50 100 { wait_for_condition 50 100 {
[s -1 role] eq {slave} && [lindex [$A role] 0] eq {slave} &&
[string match {*master_link_status:up*} [r -1 info replication]] [string match {*master_link_status:up*} [$A info replication]]
} else { } else {
fail "Can't turn the instance into a slave" fail "Can't turn the instance into a slave"
} }
@ -15,9 +22,9 @@ start_server {tags {"repl"}} {
$rd brpoplpush a b 5 $rd brpoplpush a b 5
r lpush a foo r lpush a foo
wait_for_condition 50 100 { wait_for_condition 50 100 {
[r debug digest] eq [r -1 debug digest] [$A debug digest] eq [$B debug digest]
} else { } else {
fail "Master and slave have different digest: [r debug digest] VS [r -1 debug digest]" fail "Master and slave have different digest: [$A debug digest] VS [$B debug digest]"
} }
} }
@ -28,7 +35,36 @@ start_server {tags {"repl"}} {
r lpush c 3 r lpush c 3
$rd brpoplpush c d 5 $rd brpoplpush c d 5
after 1000 after 1000
assert_equal [r debug digest] [r -1 debug digest] assert_equal [$A debug digest] [$B debug digest]
}
test {BLPOP followed by role change, issue #2473} {
set rd [redis_deferring_client]
$rd blpop foo 0 ; # Block while B is a master
# Turn B into master of A
$A slaveof no one
$B slaveof $A_host $A_port
wait_for_condition 50 100 {
[lindex [$B role] 0] eq {slave} &&
[string match {*master_link_status:up*} [$B info replication]]
} else {
fail "Can't turn the instance into a slave"
}
# Push elements into the "foo" list of the new slave.
# If the client is still attached to the instance, we'll get
# a desync between the two instances.
$A rpush foo a b c
after 100
wait_for_condition 50 100 {
[$A debug digest] eq [$B debug digest] &&
[$A lrange foo 0 -1] eq {a b c} &&
[$B lrange foo 0 -1] eq {a b c}
} else {
fail "Master and slave have different digest: [$A debug digest] VS [$B debug digest]"
}
} }
} }
} }
@ -113,7 +149,7 @@ foreach dl {no yes} {
start_server {} { start_server {} {
lappend slaves [srv 0 client] lappend slaves [srv 0 client]
test "Connect multiple slaves at the same time (issue #141), diskless=$dl" { test "Connect multiple slaves at the same time (issue #141), diskless=$dl" {
# Send SALVEOF commands to slaves # Send SLAVEOF commands to slaves
[lindex $slaves 0] slaveof $master_host $master_port [lindex $slaves 0] slaveof $master_host $master_port
[lindex $slaves 1] slaveof $master_host $master_port [lindex $slaves 1] slaveof $master_host $master_port
[lindex $slaves 2] slaveof $master_host $master_port [lindex $slaves 2] slaveof $master_host $master_port