mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

solve races in replication lpop tests (#13445) 

* some tests didn't wait for replication offset sync
* tests that used deferring client, didn't wait for it to get blocked.
an in some cases, the replication offset sync ended before the deferring
client finished, so the digest match failed.
* some tests used deferring clients excessively
* the tests didn't read the client response
* the tests didn't close the client (fd leak)
This commit is contained in:
Oran Agra 2024-07-25 14:06:40 +03:00 committed by GitHub
parent d0c64d78d4
commit e74550dd10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/integration/replication.tcl
View File

@ -110,24 +110,23 @@ start_server {tags {"repl external:skip"}} {
$A config resetstat $A config resetstat
set rd [redis_deferring_client] set rd [redis_deferring_client]
$rd brpoplpush a b 5 $rd brpoplpush a b 5
wait_for_blocked_client
r lpush a foo r lpush a foo
wait_for_condition 50 100 { wait_for_ofs_sync $B $A
[$A debug digest] eq [$B debug digest] assert_equal [$A debug digest] [$B debug digest]
} else {
fail "Master and replica have different digest: [$A debug digest] VS [$B debug digest]"
}
assert_match {*calls=1,*} [cmdrstat rpoplpush $A] assert_match {*calls=1,*} [cmdrstat rpoplpush $A]
assert_match {} [cmdrstat lmove $A] assert_match {} [cmdrstat lmove $A]
assert_equal [$rd read] {foo}
$rd close
} }
test {BRPOPLPUSH replication, list exists} { test {BRPOPLPUSH replication, list exists} {
$A config resetstat $A config resetstat
set rd [redis_deferring_client]
r lpush c 1 r lpush c 1
r lpush c 2 r lpush c 2
r lpush c 3 r lpush c 3
$rd brpoplpush c d 5 assert_equal [r brpoplpush c d 5] {1}
after 1000 wait_for_ofs_sync $B $A
assert_equal [$A debug digest] [$B debug digest] assert_equal [$A debug digest] [$B debug digest]
assert_match {*calls=1,*} [cmdrstat rpoplpush $A] assert_match {*calls=1,*} [cmdrstat rpoplpush $A]
assert_match {} [cmdrstat lmove $A] assert_match {} [cmdrstat lmove $A]
@ -139,24 +138,24 @@ start_server {tags {"repl external:skip"}} {
$A config resetstat $A config resetstat
set rd [redis_deferring_client] set rd [redis_deferring_client]
$rd blmove a b $wherefrom $whereto 5 $rd blmove a b $wherefrom $whereto 5
$rd flush
wait_for_blocked_client
r lpush a foo r lpush a foo
wait_for_condition 50 100 { wait_for_ofs_sync $B $A
[$A debug digest] eq [$B debug digest] assert_equal [$A debug digest] [$B debug digest]
} else {
fail "Master and replica have different digest: [$A debug digest] VS [$B debug digest]"
}
assert_match {*calls=1,*} [cmdrstat lmove $A] assert_match {*calls=1,*} [cmdrstat lmove $A]
assert_match {} [cmdrstat rpoplpush $A] assert_match {} [cmdrstat rpoplpush $A]
assert_equal [$rd read] {foo}
$rd close
} }
test "BLMOVE ($wherefrom, $whereto) replication, list exists" { test "BLMOVE ($wherefrom, $whereto) replication, list exists" {
$A config resetstat $A config resetstat
set rd [redis_deferring_client]
r lpush c 1 r lpush c 1
r lpush c 2 r lpush c 2
r lpush c 3 r lpush c 3
$rd blmove c d $wherefrom $whereto 5 r blmove c d $wherefrom $whereto 5
after 1000 wait_for_ofs_sync $B $A
assert_equal [$A debug digest] [$B debug digest] assert_equal [$A debug digest] [$B debug digest]
assert_match {*calls=1,*} [cmdrstat lmove $A] assert_match {*calls=1,*} [cmdrstat lmove $A]
assert_match {} [cmdrstat rpoplpush $A] assert_match {} [cmdrstat rpoplpush $A]
@ -167,6 +166,7 @@ start_server {tags {"repl external:skip"}} {
test {BLPOP followed by role change, issue #2473} { test {BLPOP followed by role change, issue #2473} {
set rd [redis_deferring_client] set rd [redis_deferring_client]
$rd blpop foo 0 ; # Block while B is a master $rd blpop foo 0 ; # Block while B is a master
wait_for_blocked_client
# Turn B into master of A # Turn B into master of A
$A slaveof no one $A slaveof no one
@ -182,7 +182,7 @@ start_server {tags {"repl external:skip"}} {
# If the client is still attached to the instance, we'll get # If the client is still attached to the instance, we'll get
# a desync between the two instances. # a desync between the two instances.
$A rpush foo a b c $A rpush foo a b c
after 100 wait_for_ofs_sync $B $A
wait_for_condition 50 100 { wait_for_condition 50 100 {
[$A debug digest] eq [$B debug digest] && [$A debug digest] eq [$B debug digest] &&
@ -192,6 +192,9 @@ start_server {tags {"repl external:skip"}} {
fail "Master and replica have different digest: [$A debug digest] VS [$B debug digest]" fail "Master and replica have different digest: [$A debug digest] VS [$B debug digest]"
} }
assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdrstat blpop $B] assert_match {*calls=1,*,rejected_calls=0,failed_calls=1*} [cmdrstat blpop $B]
assert_error {UNBLOCKED*} {$rd read}
$rd close
} }
} }
} }