2015-10-15 05:23:13 -04:00
|
|
|
proc log_file_matches {log pattern} {
|
|
|
|
set fp [open $log r]
|
|
|
|
set content [read $fp]
|
|
|
|
close $fp
|
|
|
|
string match $pattern $content
|
|
|
|
}
|
|
|
|
|
2021-06-09 08:13:24 -04:00
|
|
|
start_server {tags {"repl network external:skip"}} {
|
2015-10-15 05:23:13 -04:00
|
|
|
set slave [srv 0 client]
|
|
|
|
set slave_host [srv 0 host]
|
|
|
|
set slave_port [srv 0 port]
|
|
|
|
set slave_log [srv 0 stdout]
|
|
|
|
start_server {} {
|
|
|
|
set master [srv 0 client]
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
|
|
|
|
# Configure the master in order to hang waiting for the BGSAVE
|
|
|
|
# operation, so that the slave remains in the handshake state.
|
|
|
|
$master config set repl-diskless-sync yes
|
|
|
|
$master config set repl-diskless-sync-delay 1000
|
|
|
|
|
|
|
|
# Use a short replication timeout on the slave, so that if there
|
|
|
|
# are no bugs the timeout is triggered in a reasonable amount
|
|
|
|
# of time.
|
|
|
|
$slave config set repl-timeout 5
|
|
|
|
|
|
|
|
# Start the replication process...
|
|
|
|
$slave slaveof $master_host $master_port
|
|
|
|
|
|
|
|
test {Slave enters handshake} {
|
|
|
|
wait_for_condition 50 1000 {
|
|
|
|
[string match *handshake* [$slave role]]
|
|
|
|
} else {
|
2018-09-11 05:03:28 -04:00
|
|
|
fail "Replica does not enter handshake state"
|
2015-10-15 05:23:13 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# But make the master unable to send
|
|
|
|
# the periodic newlines to refresh the connection. The slave
|
|
|
|
# should detect the timeout.
|
|
|
|
$master debug sleep 10
|
|
|
|
|
|
|
|
test {Slave is able to detect timeout during handshake} {
|
|
|
|
wait_for_condition 50 1000 {
|
|
|
|
[log_file_matches $slave_log "*Timeout connecting to the MASTER*"]
|
|
|
|
} else {
|
2018-09-11 05:03:28 -04:00
|
|
|
fail "Replica is not able to detect timeout"
|
2015-10-15 05:23:13 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-09 08:13:24 -04:00
|
|
|
start_server {tags {"repl external:skip"}} {
|
2015-03-27 07:10:46 -04:00
|
|
|
set A [srv 0 client]
|
|
|
|
set A_host [srv 0 host]
|
|
|
|
set A_port [srv 0 port]
|
2010-07-06 11:24:00 -04:00
|
|
|
start_server {} {
|
2015-03-27 07:10:46 -04:00
|
|
|
set B [srv 0 client]
|
|
|
|
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
|
2012-04-30 04:55:03 -04:00
|
|
|
wait_for_condition 50 100 {
|
2015-03-27 07:10:46 -04:00
|
|
|
[lindex [$A role] 0] eq {slave} &&
|
|
|
|
[string match {*master_link_status:up*} [$A info replication]]
|
2012-04-30 04:55:03 -04:00
|
|
|
} else {
|
2018-09-11 05:03:28 -04:00
|
|
|
fail "Can't turn the instance into a replica"
|
2012-04-30 04:55:03 -04:00
|
|
|
}
|
|
|
|
}
|
2010-07-06 11:24:00 -04:00
|
|
|
|
2019-12-18 02:44:51 -05:00
|
|
|
test {INCRBYFLOAT replication, should not remove expire} {
|
|
|
|
r set test 1 EX 100
|
|
|
|
r incrbyfloat test 0.1
|
|
|
|
after 1000
|
|
|
|
assert_equal [$A debug digest] [$B debug digest]
|
|
|
|
}
|
|
|
|
|
2020-11-03 07:56:57 -05:00
|
|
|
test {GETSET replication} {
|
|
|
|
$A config resetstat
|
|
|
|
$A config set loglevel debug
|
|
|
|
$B config set loglevel debug
|
|
|
|
r set test foo
|
|
|
|
assert_equal [r getset test bar] foo
|
|
|
|
wait_for_condition 500 10 {
|
|
|
|
[$A get test] eq "bar"
|
|
|
|
} else {
|
|
|
|
fail "getset wasn't propagated"
|
|
|
|
}
|
|
|
|
assert_equal [r set test vaz get] bar
|
|
|
|
wait_for_condition 500 10 {
|
|
|
|
[$A get test] eq "vaz"
|
|
|
|
} else {
|
|
|
|
fail "set get wasn't propagated"
|
|
|
|
}
|
|
|
|
assert_match {*calls=3,*} [cmdrstat set $A]
|
|
|
|
assert_match {} [cmdrstat getset $A]
|
|
|
|
}
|
|
|
|
|
2011-06-20 11:07:18 -04:00
|
|
|
test {BRPOPLPUSH replication, when blocking against empty list} {
|
2020-10-08 01:33:17 -04:00
|
|
|
$A config resetstat
|
2011-06-20 11:07:18 -04:00
|
|
|
set rd [redis_deferring_client]
|
|
|
|
$rd brpoplpush a b 5
|
|
|
|
r lpush a foo
|
2012-04-26 05:25:13 -04:00
|
|
|
wait_for_condition 50 100 {
|
2015-03-27 07:10:46 -04:00
|
|
|
[$A debug digest] eq [$B debug digest]
|
2012-04-26 05:25:13 -04:00
|
|
|
} else {
|
2018-09-11 05:03:28 -04:00
|
|
|
fail "Master and replica have different digest: [$A debug digest] VS [$B debug digest]"
|
2012-04-26 05:25:13 -04:00
|
|
|
}
|
2020-10-08 01:33:17 -04:00
|
|
|
assert_match {*calls=1,*} [cmdrstat rpoplpush $A]
|
|
|
|
assert_match {} [cmdrstat lmove $A]
|
2011-06-20 11:07:18 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
test {BRPOPLPUSH replication, list exists} {
|
2020-10-08 01:33:17 -04:00
|
|
|
$A config resetstat
|
2011-06-20 11:07:18 -04:00
|
|
|
set rd [redis_deferring_client]
|
|
|
|
r lpush c 1
|
|
|
|
r lpush c 2
|
|
|
|
r lpush c 3
|
|
|
|
$rd brpoplpush c d 5
|
|
|
|
after 1000
|
2015-03-27 07:10:46 -04:00
|
|
|
assert_equal [$A debug digest] [$B debug digest]
|
2020-10-08 01:33:17 -04:00
|
|
|
assert_match {*calls=1,*} [cmdrstat rpoplpush $A]
|
|
|
|
assert_match {} [cmdrstat lmove $A]
|
|
|
|
}
|
|
|
|
|
|
|
|
foreach wherefrom {left right} {
|
|
|
|
foreach whereto {left right} {
|
|
|
|
test "BLMOVE ($wherefrom, $whereto) replication, when blocking against empty list" {
|
|
|
|
$A config resetstat
|
|
|
|
set rd [redis_deferring_client]
|
|
|
|
$rd blmove a b $wherefrom $whereto 5
|
|
|
|
r lpush a foo
|
|
|
|
wait_for_condition 50 100 {
|
|
|
|
[$A debug digest] eq [$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 {} [cmdrstat rpoplpush $A]
|
|
|
|
}
|
|
|
|
|
|
|
|
test "BLMOVE ($wherefrom, $whereto) replication, list exists" {
|
|
|
|
$A config resetstat
|
|
|
|
set rd [redis_deferring_client]
|
|
|
|
r lpush c 1
|
|
|
|
r lpush c 2
|
|
|
|
r lpush c 3
|
|
|
|
$rd blmove c d $wherefrom $whereto 5
|
|
|
|
after 1000
|
|
|
|
assert_equal [$A debug digest] [$B debug digest]
|
|
|
|
assert_match {*calls=1,*} [cmdrstat lmove $A]
|
|
|
|
assert_match {} [cmdrstat rpoplpush $A]
|
|
|
|
}
|
|
|
|
}
|
2015-03-27 07:10:46 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
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 {
|
2018-09-11 05:03:28 -04:00
|
|
|
fail "Can't turn the instance into a replica"
|
2015-03-27 07:10:46 -04:00
|
|
|
}
|
|
|
|
|
2018-09-11 05:03:28 -04:00
|
|
|
# Push elements into the "foo" list of the new replica.
|
2015-03-27 07:10:46 -04:00
|
|
|
# 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 {
|
2018-09-11 05:03:28 -04:00
|
|
|
fail "Master and replica have different digest: [$A debug digest] VS [$B debug digest]"
|
2015-03-27 07:10:46 -04:00
|
|
|
}
|
2011-06-20 11:07:18 -04:00
|
|
|
}
|
2010-07-06 11:24:00 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-09 08:13:24 -04:00
|
|
|
start_server {tags {"repl external:skip"}} {
|
2010-05-14 14:50:58 -04:00
|
|
|
r set mykey foo
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2010-06-02 16:23:52 -04:00
|
|
|
start_server {} {
|
2010-05-14 14:50:58 -04:00
|
|
|
test {Second server should have role master at first} {
|
|
|
|
s role
|
|
|
|
} {master}
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2010-05-14 14:50:58 -04:00
|
|
|
test {SLAVEOF should start with link status "down"} {
|
2021-03-22 04:50:39 -04:00
|
|
|
r multi
|
2010-05-14 14:50:58 -04:00
|
|
|
r slaveof [srv -1 host] [srv -1 port]
|
2021-03-22 04:50:39 -04:00
|
|
|
r info replication
|
|
|
|
r exec
|
|
|
|
} {*master_link_status:down*}
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2018-09-11 05:03:28 -04:00
|
|
|
test {The role should immediately be changed to "replica"} {
|
2010-05-14 14:50:58 -04:00
|
|
|
s role
|
|
|
|
} {slave}
|
|
|
|
|
|
|
|
wait_for_sync r
|
|
|
|
test {Sync should have transferred keys from master} {
|
|
|
|
r get mykey
|
|
|
|
} {foo}
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2010-05-14 14:50:58 -04:00
|
|
|
test {The link status should be up} {
|
|
|
|
s master_link_status
|
|
|
|
} {up}
|
2014-07-31 14:39:49 -04:00
|
|
|
|
2010-05-14 14:50:58 -04:00
|
|
|
test {SET on the master should immediately propagate} {
|
|
|
|
r -1 set mykey bar
|
A reimplementation of blocking operation internals.
Redis provides support for blocking operations such as BLPOP or BRPOP.
This operations are identical to normal LPOP and RPOP operations as long
as there are elements in the target list, but if the list is empty they
block waiting for new data to arrive to the list.
All the clients blocked waiting for th same list are served in a FIFO
way, so the first that blocked is the first to be served when there is
more data pushed by another client into the list.
The previous implementation of blocking operations was conceived to
serve clients in the context of push operations. For for instance:
1) There is a client "A" blocked on list "foo".
2) The client "B" performs `LPUSH foo somevalue`.
3) The client "A" is served in the context of the "B" LPUSH,
synchronously.
Processing things in a synchronous way was useful as if "A" pushes a
value that is served by "B", from the point of view of the database is a
NOP (no operation) thing, that is, nothing is replicated, nothing is
written in the AOF file, and so forth.
However later we implemented two things:
1) Variadic LPUSH that could add multiple values to a list in the
context of a single call.
2) BRPOPLPUSH that was a version of BRPOP that also provided a "PUSH"
side effect when receiving data.
This forced us to make the synchronous implementation more complex. If
client "B" is waiting for data, and "A" pushes three elemnents in a
single call, we needed to propagate an LPUSH with a missing argument
in the AOF and replication link. We also needed to make sure to
replicate the LPUSH side of BRPOPLPUSH, but only if in turn did not
happened to serve another blocking client into another list ;)
This were complex but with a few of mutually recursive functions
everything worked as expected... until one day we introduced scripting
in Redis.
Scripting + synchronous blocking operations = Issue #614.
Basically you can't "rewrite" a script to have just a partial effect on
the replicas and AOF file if the script happened to serve a few blocked
clients.
The solution to all this problems, implemented by this commit, is to
change the way we serve blocked clients. Instead of serving the blocked
clients synchronously, in the context of the command performing the PUSH
operation, it is now an asynchronous and iterative process:
1) If a key that has clients blocked waiting for data is the subject of
a list push operation, We simply mark keys as "ready" and put it into a
queue.
2) Every command pushing stuff on lists, as a variadic LPUSH, a script,
or whatever it is, is replicated verbatim without any rewriting.
3) Every time a Redis command, a MULTI/EXEC block, or a script,
completed its execution, we run the list of keys ready to serve blocked
clients (as more data arrived), and process this list serving the
blocked clients.
4) As a result of "3" maybe more keys are ready again for other clients
(as a result of BRPOPLPUSH we may have push operations), so we iterate
back to step "3" if it's needed.
The new code has a much simpler semantics, and a simpler to understand
implementation, with the disadvantage of not being able to "optmize out"
a PUSH+BPOP as a No OP.
This commit will be tested with care before the final merge, more tests
will be added likely.
2012-09-04 04:37:49 -04:00
|
|
|
|
|
|
|
wait_for_condition 500 100 {
|
|
|
|
[r 0 get mykey] eq {bar}
|
|
|
|
} else {
|
2018-09-11 05:03:28 -04:00
|
|
|
fail "SET on master did not propagated on replica"
|
A reimplementation of blocking operation internals.
Redis provides support for blocking operations such as BLPOP or BRPOP.
This operations are identical to normal LPOP and RPOP operations as long
as there are elements in the target list, but if the list is empty they
block waiting for new data to arrive to the list.
All the clients blocked waiting for th same list are served in a FIFO
way, so the first that blocked is the first to be served when there is
more data pushed by another client into the list.
The previous implementation of blocking operations was conceived to
serve clients in the context of push operations. For for instance:
1) There is a client "A" blocked on list "foo".
2) The client "B" performs `LPUSH foo somevalue`.
3) The client "A" is served in the context of the "B" LPUSH,
synchronously.
Processing things in a synchronous way was useful as if "A" pushes a
value that is served by "B", from the point of view of the database is a
NOP (no operation) thing, that is, nothing is replicated, nothing is
written in the AOF file, and so forth.
However later we implemented two things:
1) Variadic LPUSH that could add multiple values to a list in the
context of a single call.
2) BRPOPLPUSH that was a version of BRPOP that also provided a "PUSH"
side effect when receiving data.
This forced us to make the synchronous implementation more complex. If
client "B" is waiting for data, and "A" pushes three elemnents in a
single call, we needed to propagate an LPUSH with a missing argument
in the AOF and replication link. We also needed to make sure to
replicate the LPUSH side of BRPOPLPUSH, but only if in turn did not
happened to serve another blocking client into another list ;)
This were complex but with a few of mutually recursive functions
everything worked as expected... until one day we introduced scripting
in Redis.
Scripting + synchronous blocking operations = Issue #614.
Basically you can't "rewrite" a script to have just a partial effect on
the replicas and AOF file if the script happened to serve a few blocked
clients.
The solution to all this problems, implemented by this commit, is to
change the way we serve blocked clients. Instead of serving the blocked
clients synchronously, in the context of the command performing the PUSH
operation, it is now an asynchronous and iterative process:
1) If a key that has clients blocked waiting for data is the subject of
a list push operation, We simply mark keys as "ready" and put it into a
queue.
2) Every command pushing stuff on lists, as a variadic LPUSH, a script,
or whatever it is, is replicated verbatim without any rewriting.
3) Every time a Redis command, a MULTI/EXEC block, or a script,
completed its execution, we run the list of keys ready to serve blocked
clients (as more data arrived), and process this list serving the
blocked clients.
4) As a result of "3" maybe more keys are ready again for other clients
(as a result of BRPOPLPUSH we may have push operations), so we iterate
back to step "3" if it's needed.
The new code has a much simpler semantics, and a simpler to understand
implementation, with the disadvantage of not being able to "optmize out"
a PUSH+BPOP as a No OP.
This commit will be tested with care before the final merge, more tests
will be added likely.
2012-09-04 04:37:49 -04:00
|
|
|
}
|
|
|
|
}
|
2011-10-17 04:40:11 -04:00
|
|
|
|
|
|
|
test {FLUSHALL should replicate} {
|
|
|
|
r -1 flushall
|
|
|
|
if {$::valgrind} {after 2000}
|
|
|
|
list [r -1 dbsize] [r 0 dbsize]
|
|
|
|
} {0 0}
|
2014-06-23 03:08:51 -04:00
|
|
|
|
|
|
|
test {ROLE in master reports master with a slave} {
|
|
|
|
set res [r -1 role]
|
|
|
|
lassign $res role offset slaves
|
|
|
|
assert {$role eq {master}}
|
|
|
|
assert {$offset > 0}
|
|
|
|
assert {[llength $slaves] == 1}
|
|
|
|
lassign [lindex $slaves 0] master_host master_port slave_offset
|
2014-06-26 16:13:46 -04:00
|
|
|
assert {$slave_offset <= $offset}
|
2014-06-23 03:08:51 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
test {ROLE in slave reports slave in connected state} {
|
|
|
|
set res [r role]
|
|
|
|
lassign $res role master_host master_port slave_state slave_offset
|
|
|
|
assert {$role eq {slave}}
|
|
|
|
assert {$slave_state eq {connected}}
|
|
|
|
}
|
2010-05-14 14:50:58 -04:00
|
|
|
}
|
|
|
|
}
|
2012-01-06 11:28:40 -05:00
|
|
|
|
2019-07-01 08:22:29 -04:00
|
|
|
foreach mdl {no yes} {
|
|
|
|
foreach sdl {disabled swapdb} {
|
2021-06-09 08:13:24 -04:00
|
|
|
start_server {tags {"repl external:skip"}} {
|
2019-07-01 08:22:29 -04:00
|
|
|
set master [srv 0 client]
|
|
|
|
$master config set repl-diskless-sync $mdl
|
|
|
|
$master config set repl-diskless-sync-delay 1
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
set slaves {}
|
2012-01-06 11:28:40 -05:00
|
|
|
start_server {} {
|
|
|
|
lappend slaves [srv 0 client]
|
2014-10-24 03:49:22 -04:00
|
|
|
start_server {} {
|
|
|
|
lappend slaves [srv 0 client]
|
2019-07-01 08:22:29 -04:00
|
|
|
start_server {} {
|
|
|
|
lappend slaves [srv 0 client]
|
|
|
|
test "Connect multiple replicas at the same time (issue #141), master diskless=$mdl, replica diskless=$sdl" {
|
2019-07-16 04:00:34 -04:00
|
|
|
# start load handles only inside the test, so that the test can be skipped
|
|
|
|
set load_handle0 [start_bg_complex_data $master_host $master_port 9 100000000]
|
|
|
|
set load_handle1 [start_bg_complex_data $master_host $master_port 11 100000000]
|
|
|
|
set load_handle2 [start_bg_complex_data $master_host $master_port 12 100000000]
|
|
|
|
set load_handle3 [start_write_load $master_host $master_port 8]
|
|
|
|
set load_handle4 [start_write_load $master_host $master_port 4]
|
|
|
|
after 5000 ;# wait for some data to accumulate so that we have RDB part for the fork
|
|
|
|
|
2019-07-01 08:22:29 -04:00
|
|
|
# Send SLAVEOF commands to slaves
|
|
|
|
[lindex $slaves 0] config set repl-diskless-load $sdl
|
|
|
|
[lindex $slaves 1] config set repl-diskless-load $sdl
|
|
|
|
[lindex $slaves 2] config set repl-diskless-load $sdl
|
|
|
|
[lindex $slaves 0] slaveof $master_host $master_port
|
|
|
|
[lindex $slaves 1] slaveof $master_host $master_port
|
|
|
|
[lindex $slaves 2] slaveof $master_host $master_port
|
|
|
|
|
|
|
|
# Wait for all the three slaves to reach the "online"
|
|
|
|
# state from the POV of the master.
|
|
|
|
set retry 500
|
|
|
|
while {$retry} {
|
|
|
|
set info [r -3 info]
|
|
|
|
if {[string match {*slave0:*state=online*slave1:*state=online*slave2:*state=online*} $info]} {
|
|
|
|
break
|
|
|
|
} else {
|
|
|
|
incr retry -1
|
|
|
|
after 100
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if {$retry == 0} {
|
|
|
|
error "assertion:Slaves not correctly synchronized"
|
|
|
|
}
|
|
|
|
|
|
|
|
# Wait that slaves acknowledge they are online so
|
|
|
|
# we are sure that DBSIZE and DEBUG DIGEST will not
|
|
|
|
# fail because of timing issues.
|
|
|
|
wait_for_condition 500 100 {
|
|
|
|
[lindex [[lindex $slaves 0] role] 3] eq {connected} &&
|
|
|
|
[lindex [[lindex $slaves 1] role] 3] eq {connected} &&
|
|
|
|
[lindex [[lindex $slaves 2] role] 3] eq {connected}
|
2014-10-24 03:49:22 -04:00
|
|
|
} else {
|
2019-07-01 08:22:29 -04:00
|
|
|
fail "Slaves still not connected after some time"
|
2014-10-24 03:49:22 -04:00
|
|
|
}
|
|
|
|
|
2019-07-01 08:22:29 -04:00
|
|
|
# Stop the write load
|
|
|
|
stop_bg_complex_data $load_handle0
|
|
|
|
stop_bg_complex_data $load_handle1
|
|
|
|
stop_bg_complex_data $load_handle2
|
|
|
|
stop_write_load $load_handle3
|
|
|
|
stop_write_load $load_handle4
|
|
|
|
|
stabilize tests that involved with load handlers (#8967)
When test stop 'load handler' by killing the process that generating the load,
some commands that already in the input buffer, still might be processed by the server.
This may cause some instability in tests, that count on that no more commands
processed after we stop the `load handler'
In this commit, new proc 'wait_load_handlers_disconnected' added, to verify that no more
cammands from any 'load handler' prossesed, by checking that the clients who
genreate the load is disconnceted.
Also, replacing check of dbsize with wait_for_ofs_sync before comparing debug digest, as
it would fail in case the last key the workload wrote was an overridden key (not a new one).
Affected tests
Race fix:
- failover command to specific replica works
- Connect multiple replicas at the same time (issue #141), master diskless=$mdl, replica diskless=$sdl
- AOF rewrite during write load: RDB preamble=$rdbpre
Cleanup and speedup:
- Test replication with blocking lists and sorted sets operations
- Test replication with parallel clients writing in different DBs
- Test replication partial resync: $descr (diskless: $mdl, $sdl, reconnect: $reconnect
2021-05-20 08:29:43 -04:00
|
|
|
# Make sure no more commands processed
|
|
|
|
wait_load_handlers_disconnected
|
|
|
|
|
|
|
|
wait_for_ofs_sync $master [lindex $slaves 0]
|
|
|
|
wait_for_ofs_sync $master [lindex $slaves 1]
|
|
|
|
wait_for_ofs_sync $master [lindex $slaves 2]
|
2014-11-24 05:54:53 -05:00
|
|
|
|
2019-07-01 08:22:29 -04:00
|
|
|
# Check digests
|
|
|
|
set digest [$master debug digest]
|
|
|
|
set digest0 [[lindex $slaves 0] debug digest]
|
|
|
|
set digest1 [[lindex $slaves 1] debug digest]
|
|
|
|
set digest2 [[lindex $slaves 2] debug digest]
|
|
|
|
assert {$digest ne 0000000000000000000000000000000000000000}
|
|
|
|
assert {$digest eq $digest0}
|
|
|
|
assert {$digest eq $digest1}
|
|
|
|
assert {$digest eq $digest2}
|
2014-10-24 03:49:22 -04:00
|
|
|
}
|
2019-07-01 08:22:29 -04:00
|
|
|
}
|
|
|
|
}
|
2014-10-24 03:49:22 -04:00
|
|
|
}
|
2012-01-06 11:28:40 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-08-31 10:43:38 -04:00
|
|
|
|
2021-06-09 08:13:24 -04:00
|
|
|
start_server {tags {"repl external:skip"}} {
|
2018-08-31 10:43:38 -04:00
|
|
|
set master [srv 0 client]
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
start_server {} {
|
2018-09-11 05:03:28 -04:00
|
|
|
test "Master stream is correctly processed while the replica has a script in -BUSY state" {
|
2019-07-16 04:00:34 -04:00
|
|
|
set load_handle0 [start_write_load $master_host $master_port 3]
|
2018-08-31 10:43:38 -04:00
|
|
|
set slave [srv 0 client]
|
|
|
|
$slave config set lua-time-limit 500
|
|
|
|
$slave slaveof $master_host $master_port
|
|
|
|
|
|
|
|
# Wait for the slave to be online
|
|
|
|
wait_for_condition 500 100 {
|
|
|
|
[lindex [$slave role] 3] eq {connected}
|
|
|
|
} else {
|
2018-09-11 05:03:28 -04:00
|
|
|
fail "Replica still not connected after some time"
|
2018-08-31 10:43:38 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
# Wait some time to make sure the master is sending data
|
|
|
|
# to the slave.
|
|
|
|
after 5000
|
|
|
|
|
|
|
|
# Stop the ability of the slave to process data by sendig
|
|
|
|
# a script that will put it in BUSY state.
|
|
|
|
$slave eval {for i=1,3000000000 do end} 0
|
|
|
|
|
|
|
|
# Wait some time again so that more master stream will
|
|
|
|
# be processed.
|
|
|
|
after 2000
|
|
|
|
|
|
|
|
# Stop the write load
|
|
|
|
stop_write_load $load_handle0
|
|
|
|
|
|
|
|
# number of keys
|
|
|
|
wait_for_condition 500 100 {
|
|
|
|
[$master debug digest] eq [$slave debug digest]
|
|
|
|
} else {
|
2018-09-11 05:03:28 -04:00
|
|
|
fail "Different datasets between replica and master"
|
2018-08-31 10:43:38 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-07-01 08:22:29 -04:00
|
|
|
|
2019-10-09 14:15:31 -04:00
|
|
|
test {slave fails full sync and diskless load swapdb recovers it} {
|
2019-07-01 08:22:29 -04:00
|
|
|
start_server {tags {"repl"}} {
|
|
|
|
set slave [srv 0 client]
|
|
|
|
set slave_host [srv 0 host]
|
|
|
|
set slave_port [srv 0 port]
|
|
|
|
set slave_log [srv 0 stdout]
|
|
|
|
start_server {} {
|
|
|
|
set master [srv 0 client]
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
|
|
|
|
# Put different data sets on the master and slave
|
|
|
|
# we need to put large keys on the master since the slave replies to info only once in 2mb
|
|
|
|
$slave debug populate 2000 slave 10
|
2021-06-22 04:10:11 -04:00
|
|
|
$master debug populate 800 master 100000
|
2019-07-01 08:22:29 -04:00
|
|
|
$master config set rdbcompression no
|
|
|
|
|
|
|
|
# Set master and slave to use diskless replication
|
|
|
|
$master config set repl-diskless-sync yes
|
|
|
|
$master config set repl-diskless-sync-delay 0
|
|
|
|
$slave config set repl-diskless-load swapdb
|
|
|
|
|
|
|
|
# Set master with a slow rdb generation, so that we can easily disconnect it mid sync
|
2021-06-22 04:10:11 -04:00
|
|
|
# 10ms per key, with 800 keys is 8 seconds
|
2019-07-01 08:22:29 -04:00
|
|
|
$master config set rdb-key-save-delay 10000
|
|
|
|
|
|
|
|
# Start the replication process...
|
|
|
|
$slave slaveof $master_host $master_port
|
|
|
|
|
|
|
|
# wait for the slave to start reading the rdb
|
2021-10-18 03:45:45 -04:00
|
|
|
wait_for_condition 100 100 {
|
2019-07-01 08:22:29 -04:00
|
|
|
[s -1 loading] eq 1
|
|
|
|
} else {
|
|
|
|
fail "Replica didn't get into loading mode"
|
|
|
|
}
|
|
|
|
|
2021-06-10 08:39:33 -04:00
|
|
|
# make sure that next sync will not start immediately so that we can catch the slave in between syncs
|
2019-07-01 08:22:29 -04:00
|
|
|
$master config set repl-diskless-sync-delay 5
|
|
|
|
# for faster server shutdown, make rdb saving fast again (the fork is already uses the slow one)
|
|
|
|
$master config set rdb-key-save-delay 0
|
|
|
|
|
|
|
|
# waiting slave to do flushdb (key count drop)
|
|
|
|
wait_for_condition 50 100 {
|
|
|
|
2000 != [scan [regexp -inline {keys\=([\d]*)} [$slave info keyspace]] keys=%d]
|
|
|
|
} else {
|
|
|
|
fail "Replica didn't flush"
|
|
|
|
}
|
|
|
|
|
|
|
|
# make sure we're still loading
|
|
|
|
assert_equal [s -1 loading] 1
|
|
|
|
|
|
|
|
# kill the slave connection on the master
|
|
|
|
set killed [$master client kill type slave]
|
|
|
|
|
|
|
|
# wait for loading to stop (fail)
|
|
|
|
wait_for_condition 50 100 {
|
|
|
|
[s -1 loading] eq 0
|
|
|
|
} else {
|
|
|
|
fail "Replica didn't disconnect"
|
|
|
|
}
|
|
|
|
|
|
|
|
# make sure the original keys were restored
|
|
|
|
assert_equal [$slave dbsize] 2000
|
|
|
|
}
|
|
|
|
}
|
2021-06-09 08:13:24 -04:00
|
|
|
} {} {external:skip}
|
2019-07-16 04:00:34 -04:00
|
|
|
|
|
|
|
test {diskless loading short read} {
|
|
|
|
start_server {tags {"repl"}} {
|
|
|
|
set replica [srv 0 client]
|
|
|
|
set replica_host [srv 0 host]
|
|
|
|
set replica_port [srv 0 port]
|
|
|
|
start_server {} {
|
|
|
|
set master [srv 0 client]
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
|
|
|
|
# Set master and replica to use diskless replication
|
|
|
|
$master config set repl-diskless-sync yes
|
|
|
|
$master config set rdbcompression no
|
|
|
|
$replica config set repl-diskless-load swapdb
|
Accelerate diskless master connections, and general re-connections (#6271)
Diskless master has some inherent latencies.
1) fork starts with delay from cron rather than immediately
2) replica is put online only after an ACK. but the ACK
was sent only once a second.
3) but even if it would arrive immediately, it will not
register in case cron didn't yet detect that the fork is done.
Besides that, when a replica disconnects, it doesn't immediately
attempts to re-connect, it waits for replication cron (one per second).
in case it was already online, it may be important to try to re-connect
as soon as possible, so that the backlog at the master doesn't vanish.
In case it disconnected during rdb transfer, one can argue that it's
not very important to re-connect immediately, but this is needed for the
"diskless loading short read" test to be able to run 100 iterations in 5
seconds, rather than 3 (waiting for replication cron re-connection)
changes in this commit:
1) sync command starts a fork immediately if no sync_delay is configured
2) replica sends REPLCONF ACK when done reading the rdb (rather than on 1s cron)
3) when a replica unexpectedly disconnets, it immediately tries to
re-connect rather than waiting 1s
4) when when a child exits, if there is another replica waiting, we spawn a new
one right away, instead of waiting for 1s replicationCron.
5) added a call to connectWithMaster from replicationSetMaster. which is called
from the REPLICAOF command but also in 3 places in cluster.c, in all of
these the connection attempt will now be immediate instead of delayed by 1
second.
side note:
we can add a call to rdbPipeReadHandler in replconfCommand when getting
a REPLCONF ACK from the replica to solve a race where the replica got
the entire rdb and EOF marker before we detected that the pipe was
closed.
in the test i did see this race happens in one about of some 300 runs,
but i concluded that this race is unlikely in real life (where the
replica is on another host and we're more likely to first detect the
pipe was closed.
the test runs 100 iterations in 3 seconds, so in some cases it'll take 4
seconds instead (waiting for another REPLCONF ACK).
Removing unneeded startBgsaveForReplication from updateSlavesWaitingForBgsave
Now that CheckChildrenDone is calling the new replicationStartPendingFork
(extracted from serverCron) there's actually no need to call
startBgsaveForReplication from updateSlavesWaitingForBgsave anymore,
since as soon as updateSlavesWaitingForBgsave returns, CheckChildrenDone is
calling replicationStartPendingFork that handles that anyway.
The code in updateSlavesWaitingForBgsave had a bug in which it ignored
repl-diskless-sync-delay, but removing that code shows that this bug was
hiding another bug, which is that the max_idle should have used >= and
not >, this one second delay has a big impact on my new test.
2020-08-06 09:53:06 -04:00
|
|
|
$master config set hz 500
|
|
|
|
$replica config set hz 500
|
|
|
|
$master config set dynamic-hz no
|
|
|
|
$replica config set dynamic-hz no
|
2019-07-16 04:00:34 -04:00
|
|
|
# Try to fill the master with all types of data types / encodings
|
Accelerate diskless master connections, and general re-connections (#6271)
Diskless master has some inherent latencies.
1) fork starts with delay from cron rather than immediately
2) replica is put online only after an ACK. but the ACK
was sent only once a second.
3) but even if it would arrive immediately, it will not
register in case cron didn't yet detect that the fork is done.
Besides that, when a replica disconnects, it doesn't immediately
attempts to re-connect, it waits for replication cron (one per second).
in case it was already online, it may be important to try to re-connect
as soon as possible, so that the backlog at the master doesn't vanish.
In case it disconnected during rdb transfer, one can argue that it's
not very important to re-connect immediately, but this is needed for the
"diskless loading short read" test to be able to run 100 iterations in 5
seconds, rather than 3 (waiting for replication cron re-connection)
changes in this commit:
1) sync command starts a fork immediately if no sync_delay is configured
2) replica sends REPLCONF ACK when done reading the rdb (rather than on 1s cron)
3) when a replica unexpectedly disconnets, it immediately tries to
re-connect rather than waiting 1s
4) when when a child exits, if there is another replica waiting, we spawn a new
one right away, instead of waiting for 1s replicationCron.
5) added a call to connectWithMaster from replicationSetMaster. which is called
from the REPLICAOF command but also in 3 places in cluster.c, in all of
these the connection attempt will now be immediate instead of delayed by 1
second.
side note:
we can add a call to rdbPipeReadHandler in replconfCommand when getting
a REPLCONF ACK from the replica to solve a race where the replica got
the entire rdb and EOF marker before we detected that the pipe was
closed.
in the test i did see this race happens in one about of some 300 runs,
but i concluded that this race is unlikely in real life (where the
replica is on another host and we're more likely to first detect the
pipe was closed.
the test runs 100 iterations in 3 seconds, so in some cases it'll take 4
seconds instead (waiting for another REPLCONF ACK).
Removing unneeded startBgsaveForReplication from updateSlavesWaitingForBgsave
Now that CheckChildrenDone is calling the new replicationStartPendingFork
(extracted from serverCron) there's actually no need to call
startBgsaveForReplication from updateSlavesWaitingForBgsave anymore,
since as soon as updateSlavesWaitingForBgsave returns, CheckChildrenDone is
calling replicationStartPendingFork that handles that anyway.
The code in updateSlavesWaitingForBgsave had a bug in which it ignored
repl-diskless-sync-delay, but removing that code shows that this bug was
hiding another bug, which is that the max_idle should have used >= and
not >, this one second delay has a big impact on my new test.
2020-08-06 09:53:06 -04:00
|
|
|
set start [clock clicks -milliseconds]
|
2019-07-16 04:00:34 -04:00
|
|
|
for {set k 0} {$k < 3} {incr k} {
|
|
|
|
for {set i 0} {$i < 10} {incr i} {
|
|
|
|
r set "$k int_$i" [expr {int(rand()*10000)}]
|
|
|
|
r expire "$k int_$i" [expr {int(rand()*10000)}]
|
|
|
|
r set "$k string_$i" [string repeat A [expr {int(rand()*1000000)}]]
|
|
|
|
r hset "$k hash_small" [string repeat A [expr {int(rand()*10)}]] 0[string repeat A [expr {int(rand()*10)}]]
|
|
|
|
r hset "$k hash_large" [string repeat A [expr {int(rand()*10000)}]] [string repeat A [expr {int(rand()*1000000)}]]
|
|
|
|
r sadd "$k set_small" [string repeat A [expr {int(rand()*10)}]]
|
|
|
|
r sadd "$k set_large" [string repeat A [expr {int(rand()*1000000)}]]
|
|
|
|
r zadd "$k zset_small" [expr {rand()}] [string repeat A [expr {int(rand()*10)}]]
|
|
|
|
r zadd "$k zset_large" [expr {rand()}] [string repeat A [expr {int(rand()*1000000)}]]
|
|
|
|
r lpush "$k list_small" [string repeat A [expr {int(rand()*10)}]]
|
|
|
|
r lpush "$k list_large" [string repeat A [expr {int(rand()*1000000)}]]
|
|
|
|
for {set j 0} {$j < 10} {incr j} {
|
|
|
|
r xadd "$k stream" * foo "asdf" bar "1234"
|
|
|
|
}
|
|
|
|
r xgroup create "$k stream" "mygroup_$i" 0
|
|
|
|
r xreadgroup GROUP "mygroup_$i" Alice COUNT 1 STREAMS "$k stream" >
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Accelerate diskless master connections, and general re-connections (#6271)
Diskless master has some inherent latencies.
1) fork starts with delay from cron rather than immediately
2) replica is put online only after an ACK. but the ACK
was sent only once a second.
3) but even if it would arrive immediately, it will not
register in case cron didn't yet detect that the fork is done.
Besides that, when a replica disconnects, it doesn't immediately
attempts to re-connect, it waits for replication cron (one per second).
in case it was already online, it may be important to try to re-connect
as soon as possible, so that the backlog at the master doesn't vanish.
In case it disconnected during rdb transfer, one can argue that it's
not very important to re-connect immediately, but this is needed for the
"diskless loading short read" test to be able to run 100 iterations in 5
seconds, rather than 3 (waiting for replication cron re-connection)
changes in this commit:
1) sync command starts a fork immediately if no sync_delay is configured
2) replica sends REPLCONF ACK when done reading the rdb (rather than on 1s cron)
3) when a replica unexpectedly disconnets, it immediately tries to
re-connect rather than waiting 1s
4) when when a child exits, if there is another replica waiting, we spawn a new
one right away, instead of waiting for 1s replicationCron.
5) added a call to connectWithMaster from replicationSetMaster. which is called
from the REPLICAOF command but also in 3 places in cluster.c, in all of
these the connection attempt will now be immediate instead of delayed by 1
second.
side note:
we can add a call to rdbPipeReadHandler in replconfCommand when getting
a REPLCONF ACK from the replica to solve a race where the replica got
the entire rdb and EOF marker before we detected that the pipe was
closed.
in the test i did see this race happens in one about of some 300 runs,
but i concluded that this race is unlikely in real life (where the
replica is on another host and we're more likely to first detect the
pipe was closed.
the test runs 100 iterations in 3 seconds, so in some cases it'll take 4
seconds instead (waiting for another REPLCONF ACK).
Removing unneeded startBgsaveForReplication from updateSlavesWaitingForBgsave
Now that CheckChildrenDone is calling the new replicationStartPendingFork
(extracted from serverCron) there's actually no need to call
startBgsaveForReplication from updateSlavesWaitingForBgsave anymore,
since as soon as updateSlavesWaitingForBgsave returns, CheckChildrenDone is
calling replicationStartPendingFork that handles that anyway.
The code in updateSlavesWaitingForBgsave had a bug in which it ignored
repl-diskless-sync-delay, but removing that code shows that this bug was
hiding another bug, which is that the max_idle should have used >= and
not >, this one second delay has a big impact on my new test.
2020-08-06 09:53:06 -04:00
|
|
|
if {$::verbose} {
|
|
|
|
set end [clock clicks -milliseconds]
|
|
|
|
set duration [expr $end - $start]
|
|
|
|
puts "filling took $duration ms (TODO: use pipeline)"
|
|
|
|
set start [clock clicks -milliseconds]
|
|
|
|
}
|
|
|
|
|
2019-07-16 04:00:34 -04:00
|
|
|
# Start the replication process...
|
2020-07-10 01:28:22 -04:00
|
|
|
set loglines [count_log_lines -1]
|
2019-07-16 04:00:34 -04:00
|
|
|
$master config set repl-diskless-sync-delay 0
|
|
|
|
$replica replicaof $master_host $master_port
|
|
|
|
|
|
|
|
# kill the replication at various points
|
Accelerate diskless master connections, and general re-connections (#6271)
Diskless master has some inherent latencies.
1) fork starts with delay from cron rather than immediately
2) replica is put online only after an ACK. but the ACK
was sent only once a second.
3) but even if it would arrive immediately, it will not
register in case cron didn't yet detect that the fork is done.
Besides that, when a replica disconnects, it doesn't immediately
attempts to re-connect, it waits for replication cron (one per second).
in case it was already online, it may be important to try to re-connect
as soon as possible, so that the backlog at the master doesn't vanish.
In case it disconnected during rdb transfer, one can argue that it's
not very important to re-connect immediately, but this is needed for the
"diskless loading short read" test to be able to run 100 iterations in 5
seconds, rather than 3 (waiting for replication cron re-connection)
changes in this commit:
1) sync command starts a fork immediately if no sync_delay is configured
2) replica sends REPLCONF ACK when done reading the rdb (rather than on 1s cron)
3) when a replica unexpectedly disconnets, it immediately tries to
re-connect rather than waiting 1s
4) when when a child exits, if there is another replica waiting, we spawn a new
one right away, instead of waiting for 1s replicationCron.
5) added a call to connectWithMaster from replicationSetMaster. which is called
from the REPLICAOF command but also in 3 places in cluster.c, in all of
these the connection attempt will now be immediate instead of delayed by 1
second.
side note:
we can add a call to rdbPipeReadHandler in replconfCommand when getting
a REPLCONF ACK from the replica to solve a race where the replica got
the entire rdb and EOF marker before we detected that the pipe was
closed.
in the test i did see this race happens in one about of some 300 runs,
but i concluded that this race is unlikely in real life (where the
replica is on another host and we're more likely to first detect the
pipe was closed.
the test runs 100 iterations in 3 seconds, so in some cases it'll take 4
seconds instead (waiting for another REPLCONF ACK).
Removing unneeded startBgsaveForReplication from updateSlavesWaitingForBgsave
Now that CheckChildrenDone is calling the new replicationStartPendingFork
(extracted from serverCron) there's actually no need to call
startBgsaveForReplication from updateSlavesWaitingForBgsave anymore,
since as soon as updateSlavesWaitingForBgsave returns, CheckChildrenDone is
calling replicationStartPendingFork that handles that anyway.
The code in updateSlavesWaitingForBgsave had a bug in which it ignored
repl-diskless-sync-delay, but removing that code shows that this bug was
hiding another bug, which is that the max_idle should have used >= and
not >, this one second delay has a big impact on my new test.
2020-08-06 09:53:06 -04:00
|
|
|
set attempts 100
|
|
|
|
if {$::accurate} { set attempts 500 }
|
2019-07-16 04:00:34 -04:00
|
|
|
for {set i 0} {$i < $attempts} {incr i} {
|
|
|
|
# wait for the replica to start reading the rdb
|
|
|
|
# using the log file since the replica only responds to INFO once in 2mb
|
2020-07-28 04:15:29 -04:00
|
|
|
set res [wait_for_log_messages -1 {"*Loading DB in memory*"} $loglines 2000 1]
|
|
|
|
set loglines [lindex $res 1]
|
2019-07-16 04:00:34 -04:00
|
|
|
|
|
|
|
# add some additional random sleep so that we kill the master on a different place each time
|
2020-07-28 04:15:29 -04:00
|
|
|
after [expr {int(rand()*50)}]
|
2019-07-16 04:00:34 -04:00
|
|
|
|
|
|
|
# kill the replica connection on the master
|
|
|
|
set killed [$master client kill type replica]
|
|
|
|
|
2020-07-28 04:15:29 -04:00
|
|
|
set res [wait_for_log_messages -1 {"*Internal error in RDB*" "*Finished with success*" "*Successful partial resynchronization*"} $loglines 1000 1]
|
|
|
|
if {$::verbose} { puts $res }
|
|
|
|
set log_text [lindex $res 0]
|
|
|
|
set loglines [lindex $res 1]
|
|
|
|
if {![string match "*Internal error in RDB*" $log_text]} {
|
2019-07-16 04:00:34 -04:00
|
|
|
# force the replica to try another full sync
|
2020-07-28 04:15:29 -04:00
|
|
|
$master multi
|
2019-07-16 04:00:34 -04:00
|
|
|
$master client kill type replica
|
|
|
|
$master set asdf asdf
|
Replication backlog and replicas use one global shared replication buffer (#9166)
## Background
For redis master, one replica uses one copy of replication buffer, that is a big waste of memory,
more replicas more waste, and allocate/free memory for every reply list also cost much.
If we set client-output-buffer-limit small and write traffic is heavy, master may disconnect with
replicas and can't finish synchronization with replica. If we set client-output-buffer-limit big,
master may be OOM when there are many replicas that separately keep much memory.
Because replication buffers of different replica client are the same, one simple idea is that
all replicas only use one replication buffer, that will effectively save memory.
Since replication backlog content is the same as replicas' output buffer, now we
can discard replication backlog memory and use global shared replication buffer
to implement replication backlog mechanism.
## Implementation
I create one global "replication buffer" which contains content of replication stream.
The structure of "replication buffer" is similar to the reply list that exists in every client.
But the node of list is `replBufBlock`, which has `id, repl_offset, refcount` fields.
```c
/* Replication buffer blocks is the list of replBufBlock.
*
* +--------------+ +--------------+ +--------------+
* | refcount = 1 | ... | refcount = 0 | ... | refcount = 2 |
* +--------------+ +--------------+ +--------------+
* | / \
* | / \
* | / \
* Repl Backlog Replia_A Replia_B
*
* Each replica or replication backlog increments only the refcount of the
* 'ref_repl_buf_node' which it points to. So when replica walks to the next
* node, it should first increase the next node's refcount, and when we trim
* the replication buffer nodes, we remove node always from the head node which
* refcount is 0. If the refcount of the head node is not 0, we must stop
* trimming and never iterate the next node. */
/* Similar with 'clientReplyBlock', it is used for shared buffers between
* all replica clients and replication backlog. */
typedef struct replBufBlock {
int refcount; /* Number of replicas or repl backlog using. */
long long id; /* The unique incremental number. */
long long repl_offset; /* Start replication offset of the block. */
size_t size, used;
char buf[];
} replBufBlock;
```
So now when we feed replication stream into replication backlog and all replicas, we only need
to feed stream into replication buffer `feedReplicationBuffer`. In this function, we set some fields of
replication backlog and replicas to references of the global replication buffer blocks. And we also
need to check replicas' output buffer limit to free if exceeding `client-output-buffer-limit`, and trim
replication backlog if exceeding `repl-backlog-size`.
When sending reply to replicas, we also need to iterate replication buffer blocks and send its
content, when totally sending one block for replica, we decrease current node count and
increase the next current node count, and then free the block which reference is 0 from the
head of replication buffer blocks.
Since now we use linked list to manage replication backlog, it may cost much time for iterating
all linked list nodes to find corresponding replication buffer node. So we create a rax tree to
store some nodes for index, but to avoid rax tree occupying too much memory, i record
one per 64 nodes for index.
Currently, to make partial resynchronization as possible as much, we always let replication
backlog as the last reference of replication buffer blocks, backlog size may exceeds our setting
if slow replicas that reference vast replication buffer blocks, and this method doesn't increase
memory usage since they share replication buffer. To avoid freezing server for freeing unreferenced
replication buffer blocks when we need to trim backlog for exceeding backlog size setting,
we trim backlog incrementally (free 64 blocks per call now), and make it faster in
`beforeSleep` (free 640 blocks).
### Other changes
- `mem_total_replication_buffers`: we add this field in INFO command, it means the total
memory of replication buffers used.
- `mem_clients_slaves`: now even replica is slow to replicate, and its output buffer memory
is not 0, but it still may be 0, since replication backlog and replicas share one global replication
buffer, only if replication buffer memory is more than the repl backlog setting size, we consider
the excess as replicas' memory. Otherwise, we think replication buffer memory is the consumption
of repl backlog.
- Key eviction
Since all replicas and replication backlog share global replication buffer, we think only the
part of exceeding backlog size the extra separate consumption of replicas.
Because we trim backlog incrementally in the background, backlog size may exceeds our
setting if slow replicas that reference vast replication buffer blocks disconnect.
To avoid massive eviction loop, we don't count the delayed freed replication backlog into
used memory even if there are no replicas, i.e. we also regard this memory as replicas's memory.
- `client-output-buffer-limit` check for replica clients
It doesn't make sense to set the replica clients output buffer limit lower than the repl-backlog-size
config (partial sync will succeed and then replica will get disconnected). Such a configuration is
ignored (the size of repl-backlog-size will be used). This doesn't have memory consumption
implications since the replica client will share the backlog buffers memory.
- Drop replication backlog after loading data if needed
We always create replication backlog if server is a master, we need it because we put DELs in
it when loading expired keys in RDB, but if RDB doesn't have replication info or there is no rdb,
it is not possible to support partial resynchronization, to avoid extra memory of replication backlog,
we drop it.
- Multi IO threads
Since all replicas and replication backlog use global replication buffer, if I/O threads are enabled,
to guarantee data accessing thread safe, we must let main thread handle sending the output buffer
to all replicas. But before, other IO threads could handle sending output buffer of all replicas.
## Other optimizations
This solution resolve some other problem:
- When replicas disconnect with master since of out of output buffer limit, releasing the output
buffer of replicas may freeze server if we set big `client-output-buffer-limit` for replicas, but now,
it doesn't cause freezing.
- This implementation may mitigate reply list copy cost time(also freezes server) when one replication
has huge reply buffer and another replica can copy buffer for full synchronization. now, we just copy
reference info, it is very light.
- If we set replication backlog size big, it also may cost much time to copy replication backlog into
replica's output buffer. But this commit eliminates this problem.
- Resizing replication backlog size doesn't empty current replication backlog content.
2021-10-25 02:24:31 -04:00
|
|
|
# fill replication backlog with new content
|
|
|
|
$master config set repl-backlog-size 16384
|
|
|
|
for {set keyid 0} {$keyid < 10} {incr keyid} {
|
|
|
|
$master set "$keyid string_$keyid" [string repeat A 16384]
|
|
|
|
}
|
2020-07-28 04:15:29 -04:00
|
|
|
$master exec
|
2019-07-16 04:00:34 -04:00
|
|
|
}
|
|
|
|
# wait for loading to stop (fail)
|
2020-07-28 04:15:29 -04:00
|
|
|
wait_for_condition 1000 1 {
|
2019-07-16 04:00:34 -04:00
|
|
|
[s -1 loading] eq 0
|
|
|
|
} else {
|
|
|
|
fail "Replica didn't disconnect"
|
|
|
|
}
|
|
|
|
}
|
Accelerate diskless master connections, and general re-connections (#6271)
Diskless master has some inherent latencies.
1) fork starts with delay from cron rather than immediately
2) replica is put online only after an ACK. but the ACK
was sent only once a second.
3) but even if it would arrive immediately, it will not
register in case cron didn't yet detect that the fork is done.
Besides that, when a replica disconnects, it doesn't immediately
attempts to re-connect, it waits for replication cron (one per second).
in case it was already online, it may be important to try to re-connect
as soon as possible, so that the backlog at the master doesn't vanish.
In case it disconnected during rdb transfer, one can argue that it's
not very important to re-connect immediately, but this is needed for the
"diskless loading short read" test to be able to run 100 iterations in 5
seconds, rather than 3 (waiting for replication cron re-connection)
changes in this commit:
1) sync command starts a fork immediately if no sync_delay is configured
2) replica sends REPLCONF ACK when done reading the rdb (rather than on 1s cron)
3) when a replica unexpectedly disconnets, it immediately tries to
re-connect rather than waiting 1s
4) when when a child exits, if there is another replica waiting, we spawn a new
one right away, instead of waiting for 1s replicationCron.
5) added a call to connectWithMaster from replicationSetMaster. which is called
from the REPLICAOF command but also in 3 places in cluster.c, in all of
these the connection attempt will now be immediate instead of delayed by 1
second.
side note:
we can add a call to rdbPipeReadHandler in replconfCommand when getting
a REPLCONF ACK from the replica to solve a race where the replica got
the entire rdb and EOF marker before we detected that the pipe was
closed.
in the test i did see this race happens in one about of some 300 runs,
but i concluded that this race is unlikely in real life (where the
replica is on another host and we're more likely to first detect the
pipe was closed.
the test runs 100 iterations in 3 seconds, so in some cases it'll take 4
seconds instead (waiting for another REPLCONF ACK).
Removing unneeded startBgsaveForReplication from updateSlavesWaitingForBgsave
Now that CheckChildrenDone is calling the new replicationStartPendingFork
(extracted from serverCron) there's actually no need to call
startBgsaveForReplication from updateSlavesWaitingForBgsave anymore,
since as soon as updateSlavesWaitingForBgsave returns, CheckChildrenDone is
calling replicationStartPendingFork that handles that anyway.
The code in updateSlavesWaitingForBgsave had a bug in which it ignored
repl-diskless-sync-delay, but removing that code shows that this bug was
hiding another bug, which is that the max_idle should have used >= and
not >, this one second delay has a big impact on my new test.
2020-08-06 09:53:06 -04:00
|
|
|
if {$::verbose} {
|
|
|
|
set end [clock clicks -milliseconds]
|
|
|
|
set duration [expr $end - $start]
|
|
|
|
puts "test took $duration ms"
|
|
|
|
}
|
2019-07-16 04:00:34 -04:00
|
|
|
# enable fast shutdown
|
|
|
|
$master config set rdb-key-save-delay 0
|
|
|
|
}
|
|
|
|
}
|
2021-06-09 08:13:24 -04:00
|
|
|
} {} {external:skip}
|
2019-07-16 04:00:34 -04:00
|
|
|
|
2019-08-11 09:07:53 -04:00
|
|
|
# get current stime and utime metrics for a thread (since it's creation)
|
|
|
|
proc get_cpu_metrics { statfile } {
|
|
|
|
if { [ catch {
|
|
|
|
set fid [ open $statfile r ]
|
|
|
|
set data [ read $fid 1024 ]
|
|
|
|
::close $fid
|
|
|
|
set data [ split $data ]
|
|
|
|
|
|
|
|
;## number of jiffies it has been scheduled...
|
|
|
|
set utime [ lindex $data 13 ]
|
|
|
|
set stime [ lindex $data 14 ]
|
|
|
|
} err ] } {
|
|
|
|
error "assertion:can't parse /proc: $err"
|
|
|
|
}
|
|
|
|
set mstime [clock milliseconds]
|
|
|
|
return [ list $mstime $utime $stime ]
|
|
|
|
}
|
|
|
|
|
|
|
|
# compute %utime and %stime of a thread between two measurements
|
|
|
|
proc compute_cpu_usage {start end} {
|
|
|
|
set clock_ticks [exec getconf CLK_TCK]
|
|
|
|
# convert ms time to jiffies and calc delta
|
|
|
|
set dtime [ expr { ([lindex $end 0] - [lindex $start 0]) * double($clock_ticks) / 1000 } ]
|
|
|
|
set utime [ expr { [lindex $end 1] - [lindex $start 1] } ]
|
|
|
|
set stime [ expr { [lindex $end 2] - [lindex $start 2] } ]
|
|
|
|
set pucpu [ expr { ($utime / $dtime) * 100 } ]
|
|
|
|
set pscpu [ expr { ($stime / $dtime) * 100 } ]
|
|
|
|
return [ list $pucpu $pscpu ]
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
# test diskless rdb pipe with multiple replicas, which may drop half way
|
2021-06-09 08:13:24 -04:00
|
|
|
start_server {tags {"repl external:skip"}} {
|
2019-08-11 09:07:53 -04:00
|
|
|
set master [srv 0 client]
|
|
|
|
$master config set repl-diskless-sync yes
|
|
|
|
$master config set repl-diskless-sync-delay 1
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
2019-09-12 04:10:22 -04:00
|
|
|
set master_pid [srv 0 pid]
|
2019-08-11 09:07:53 -04:00
|
|
|
# put enough data in the db that the rdb file will be bigger than the socket buffers
|
2020-05-12 01:59:09 -04:00
|
|
|
# and since we'll have key-load-delay of 100, 20000 keys will take at least 2 seconds
|
2019-08-11 09:07:53 -04:00
|
|
|
# we also need the replica to process requests during transfer (which it does only once in 2mb)
|
2020-05-12 01:59:09 -04:00
|
|
|
$master debug populate 20000 test 10000
|
2019-08-11 09:07:53 -04:00
|
|
|
$master config set rdbcompression no
|
2019-09-12 04:10:22 -04:00
|
|
|
# If running on Linux, we also measure utime/stime to detect possible I/O handling issues
|
2021-04-18 08:12:34 -04:00
|
|
|
set os [catch {exec uname}]
|
2019-09-12 04:10:22 -04:00
|
|
|
set measure_time [expr {$os == "Linux"} ? 1 : 0]
|
2021-04-15 10:18:51 -04:00
|
|
|
foreach all_drop {no slow fast all timeout} {
|
2019-08-11 09:07:53 -04:00
|
|
|
test "diskless $all_drop replicas drop during rdb pipe" {
|
|
|
|
set replicas {}
|
|
|
|
set replicas_alive {}
|
|
|
|
# start one replica that will read the rdb fast, and one that will be slow
|
|
|
|
start_server {} {
|
|
|
|
lappend replicas [srv 0 client]
|
|
|
|
lappend replicas_alive [srv 0 client]
|
|
|
|
start_server {} {
|
|
|
|
lappend replicas [srv 0 client]
|
|
|
|
lappend replicas_alive [srv 0 client]
|
|
|
|
|
|
|
|
# start replication
|
|
|
|
# it's enough for just one replica to be slow, and have it's write handler enabled
|
|
|
|
# so that the whole rdb generation process is bound to that
|
2021-11-02 04:32:01 -04:00
|
|
|
set loglines [count_log_lines -2]
|
2019-08-11 09:07:53 -04:00
|
|
|
[lindex $replicas 0] config set repl-diskless-load swapdb
|
2021-04-18 08:12:34 -04:00
|
|
|
[lindex $replicas 0] config set key-load-delay 100 ;# 20k keys and 100 microseconds sleep means at least 2 seconds
|
2019-08-11 09:07:53 -04:00
|
|
|
[lindex $replicas 0] replicaof $master_host $master_port
|
|
|
|
[lindex $replicas 1] replicaof $master_host $master_port
|
|
|
|
|
|
|
|
# wait for the replicas to start reading the rdb
|
|
|
|
# using the log file since the replica only responds to INFO once in 2mb
|
2021-11-02 04:32:01 -04:00
|
|
|
wait_for_log_messages -1 {"*Loading DB in memory*"} 0 800 10
|
2019-08-11 09:07:53 -04:00
|
|
|
|
2019-09-12 04:10:22 -04:00
|
|
|
if {$measure_time} {
|
|
|
|
set master_statfile "/proc/$master_pid/stat"
|
|
|
|
set master_start_metrics [get_cpu_metrics $master_statfile]
|
|
|
|
set start_time [clock seconds]
|
|
|
|
}
|
2019-08-11 09:07:53 -04:00
|
|
|
|
|
|
|
# wait a while so that the pipe socket writer will be
|
|
|
|
# blocked on write (since replica 0 is slow to read from the socket)
|
|
|
|
after 500
|
|
|
|
|
|
|
|
# add some command to be present in the command stream after the rdb.
|
|
|
|
$master incr $all_drop
|
|
|
|
|
|
|
|
# disconnect replicas depending on the current test
|
|
|
|
if {$all_drop == "all" || $all_drop == "fast"} {
|
|
|
|
exec kill [srv 0 pid]
|
|
|
|
set replicas_alive [lreplace $replicas_alive 1 1]
|
|
|
|
}
|
|
|
|
if {$all_drop == "all" || $all_drop == "slow"} {
|
|
|
|
exec kill [srv -1 pid]
|
|
|
|
set replicas_alive [lreplace $replicas_alive 0 0]
|
|
|
|
}
|
2021-04-15 10:18:51 -04:00
|
|
|
if {$all_drop == "timeout"} {
|
2021-04-18 08:12:34 -04:00
|
|
|
$master config set repl-timeout 2
|
|
|
|
# we want the slow replica to hang on a key for very long so it'll reach repl-timeout
|
2021-04-15 10:18:51 -04:00
|
|
|
exec kill -SIGSTOP [srv -1 pid]
|
2021-04-18 08:12:34 -04:00
|
|
|
after 2000
|
2021-04-15 10:18:51 -04:00
|
|
|
}
|
2019-08-11 09:07:53 -04:00
|
|
|
|
|
|
|
# wait for rdb child to exit
|
|
|
|
wait_for_condition 500 100 {
|
|
|
|
[s -2 rdb_bgsave_in_progress] == 0
|
|
|
|
} else {
|
|
|
|
fail "rdb child didn't terminate"
|
|
|
|
}
|
|
|
|
|
|
|
|
# make sure we got what we were aiming for, by looking for the message in the log file
|
|
|
|
if {$all_drop == "all"} {
|
2020-07-28 04:15:29 -04:00
|
|
|
wait_for_log_messages -2 {"*Diskless rdb transfer, last replica dropped, killing fork child*"} $loglines 1 1
|
2019-08-11 09:07:53 -04:00
|
|
|
}
|
|
|
|
if {$all_drop == "no"} {
|
2020-07-28 04:15:29 -04:00
|
|
|
wait_for_log_messages -2 {"*Diskless rdb transfer, done reading from pipe, 2 replicas still up*"} $loglines 1 1
|
2019-08-11 09:07:53 -04:00
|
|
|
}
|
|
|
|
if {$all_drop == "slow" || $all_drop == "fast"} {
|
2020-07-28 04:15:29 -04:00
|
|
|
wait_for_log_messages -2 {"*Diskless rdb transfer, done reading from pipe, 1 replicas still up*"} $loglines 1 1
|
2019-08-11 09:07:53 -04:00
|
|
|
}
|
2021-04-15 10:18:51 -04:00
|
|
|
if {$all_drop == "timeout"} {
|
|
|
|
wait_for_log_messages -2 {"*Disconnecting timedout replica (full sync)*"} $loglines 1 1
|
|
|
|
wait_for_log_messages -2 {"*Diskless rdb transfer, done reading from pipe, 1 replicas still up*"} $loglines 1 1
|
|
|
|
# master disconnected the slow replica, remove from array
|
|
|
|
set replicas_alive [lreplace $replicas_alive 0 0]
|
|
|
|
# release it
|
|
|
|
exec kill -SIGCONT [srv -1 pid]
|
|
|
|
}
|
2019-08-11 09:07:53 -04:00
|
|
|
|
|
|
|
# make sure we don't have a busy loop going thought epoll_wait
|
2019-09-12 04:10:22 -04:00
|
|
|
if {$measure_time} {
|
|
|
|
set master_end_metrics [get_cpu_metrics $master_statfile]
|
|
|
|
set time_elapsed [expr {[clock seconds]-$start_time}]
|
|
|
|
set master_cpu [compute_cpu_usage $master_start_metrics $master_end_metrics]
|
|
|
|
set master_utime [lindex $master_cpu 0]
|
|
|
|
set master_stime [lindex $master_cpu 1]
|
|
|
|
if {$::verbose} {
|
|
|
|
puts "elapsed: $time_elapsed"
|
|
|
|
puts "master utime: $master_utime"
|
|
|
|
puts "master stime: $master_stime"
|
|
|
|
}
|
2021-04-15 10:18:51 -04:00
|
|
|
if {!$::no_latency && ($all_drop == "all" || $all_drop == "slow" || $all_drop == "timeout")} {
|
2019-09-12 04:10:22 -04:00
|
|
|
assert {$master_utime < 70}
|
|
|
|
assert {$master_stime < 70}
|
|
|
|
}
|
2020-10-22 04:10:53 -04:00
|
|
|
if {!$::no_latency && ($all_drop == "none" || $all_drop == "fast")} {
|
2019-09-12 04:10:22 -04:00
|
|
|
assert {$master_utime < 15}
|
|
|
|
assert {$master_stime < 15}
|
|
|
|
}
|
2019-08-11 09:07:53 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
# verify the data integrity
|
|
|
|
foreach replica $replicas_alive {
|
|
|
|
# Wait that replicas acknowledge they are online so
|
|
|
|
# we are sure that DBSIZE and DEBUG DIGEST will not
|
|
|
|
# fail because of timing issues.
|
2020-05-18 03:01:30 -04:00
|
|
|
wait_for_condition 150 100 {
|
2019-08-11 09:07:53 -04:00
|
|
|
[lindex [$replica role] 3] eq {connected}
|
|
|
|
} else {
|
|
|
|
fail "replicas still not connected after some time"
|
|
|
|
}
|
|
|
|
|
|
|
|
# Make sure that replicas and master have same
|
|
|
|
# number of keys
|
|
|
|
wait_for_condition 50 100 {
|
|
|
|
[$master dbsize] == [$replica dbsize]
|
|
|
|
} else {
|
|
|
|
fail "Different number of keys between master and replicas after too long time."
|
|
|
|
}
|
|
|
|
|
|
|
|
# Check digests
|
|
|
|
set digest [$master debug digest]
|
|
|
|
set digest0 [$replica debug digest]
|
|
|
|
assert {$digest ne 0000000000000000000000000000000000000000}
|
|
|
|
assert {$digest eq $digest0}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-05-17 11:26:02 -04:00
|
|
|
|
if diskless repl child is killed, make sure to reap the pid (#7742)
Starting redis 6.0 and the changes we made to the diskless master to be
suitable for TLS, I made the master avoid reaping (wait3) the pid of the
child until we know all replicas are done reading their rdb.
I did that in order to avoid a state where the rdb_child_pid is -1 but
we don't yet want to start another fork (still busy serving that data to
replicas).
It turns out that the solution used so far was problematic in case the
fork child was being killed (e.g. by the kernel OOM killer), in that
case there's a chance that we currently disabled the read event on the
rdb pipe, since we're waiting for a replica to become writable again.
and in that scenario the master would have never realized the child
exited, and the replica will remain hung too.
Note that there's no mechanism to detect a hung replica while it's in
rdb transfer state.
The solution here is to add another pipe which is used by the parent to
tell the child it is safe to exit. this mean that when the child exits,
for whatever reason, it is safe to reap it.
Besides that, i'm re-introducing an adjustment to REPLCONF ACK which was
part of #6271 (Accelerate diskless master connections) but was dropped
when that PR was rebased after the TLS fork/pipe changes (5a47794).
Now that RdbPipeCleanup no longer calls checkChildrenDone, and the ACK
has chance to detect that the child exited, it should be the one to call
it so that we don't have to wait for cron (server.hz) to do that.
2020-09-06 09:43:57 -04:00
|
|
|
test "diskless replication child being killed is collected" {
|
|
|
|
# when diskless master is waiting for the replica to become writable
|
|
|
|
# it removes the read event from the rdb pipe so if the child gets killed
|
2021-03-24 11:41:05 -04:00
|
|
|
# the replica will hung. and the master may not collect the pid with waitpid
|
if diskless repl child is killed, make sure to reap the pid (#7742)
Starting redis 6.0 and the changes we made to the diskless master to be
suitable for TLS, I made the master avoid reaping (wait3) the pid of the
child until we know all replicas are done reading their rdb.
I did that in order to avoid a state where the rdb_child_pid is -1 but
we don't yet want to start another fork (still busy serving that data to
replicas).
It turns out that the solution used so far was problematic in case the
fork child was being killed (e.g. by the kernel OOM killer), in that
case there's a chance that we currently disabled the read event on the
rdb pipe, since we're waiting for a replica to become writable again.
and in that scenario the master would have never realized the child
exited, and the replica will remain hung too.
Note that there's no mechanism to detect a hung replica while it's in
rdb transfer state.
The solution here is to add another pipe which is used by the parent to
tell the child it is safe to exit. this mean that when the child exits,
for whatever reason, it is safe to reap it.
Besides that, i'm re-introducing an adjustment to REPLCONF ACK which was
part of #6271 (Accelerate diskless master connections) but was dropped
when that PR was rebased after the TLS fork/pipe changes (5a47794).
Now that RdbPipeCleanup no longer calls checkChildrenDone, and the ACK
has chance to detect that the child exited, it should be the one to call
it so that we don't have to wait for cron (server.hz) to do that.
2020-09-06 09:43:57 -04:00
|
|
|
start_server {tags {"repl"}} {
|
|
|
|
set master [srv 0 client]
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
set master_pid [srv 0 pid]
|
|
|
|
$master config set repl-diskless-sync yes
|
|
|
|
$master config set repl-diskless-sync-delay 0
|
|
|
|
# put enough data in the db that the rdb file will be bigger than the socket buffers
|
|
|
|
$master debug populate 20000 test 10000
|
|
|
|
$master config set rdbcompression no
|
|
|
|
start_server {} {
|
|
|
|
set replica [srv 0 client]
|
|
|
|
set loglines [count_log_lines 0]
|
|
|
|
$replica config set repl-diskless-load swapdb
|
|
|
|
$replica config set key-load-delay 1000000
|
|
|
|
$replica replicaof $master_host $master_port
|
|
|
|
|
|
|
|
# wait for the replicas to start reading the rdb
|
|
|
|
wait_for_log_messages 0 {"*Loading DB in memory*"} $loglines 800 10
|
|
|
|
|
|
|
|
# wait to be sure the eplica is hung and the master is blocked on write
|
|
|
|
after 500
|
|
|
|
|
|
|
|
# simulate the OOM killer or anyone else kills the child
|
|
|
|
set fork_child_pid [get_child_pid -1]
|
|
|
|
exec kill -9 $fork_child_pid
|
|
|
|
|
|
|
|
# wait for the parent to notice the child have exited
|
|
|
|
wait_for_condition 50 100 {
|
|
|
|
[s -1 rdb_bgsave_in_progress] == 0
|
|
|
|
} else {
|
|
|
|
fail "rdb child didn't terminate"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-06-09 08:13:24 -04:00
|
|
|
} {} {external:skip}
|
if diskless repl child is killed, make sure to reap the pid (#7742)
Starting redis 6.0 and the changes we made to the diskless master to be
suitable for TLS, I made the master avoid reaping (wait3) the pid of the
child until we know all replicas are done reading their rdb.
I did that in order to avoid a state where the rdb_child_pid is -1 but
we don't yet want to start another fork (still busy serving that data to
replicas).
It turns out that the solution used so far was problematic in case the
fork child was being killed (e.g. by the kernel OOM killer), in that
case there's a chance that we currently disabled the read event on the
rdb pipe, since we're waiting for a replica to become writable again.
and in that scenario the master would have never realized the child
exited, and the replica will remain hung too.
Note that there's no mechanism to detect a hung replica while it's in
rdb transfer state.
The solution here is to add another pipe which is used by the parent to
tell the child it is safe to exit. this mean that when the child exits,
for whatever reason, it is safe to reap it.
Besides that, i'm re-introducing an adjustment to REPLCONF ACK which was
part of #6271 (Accelerate diskless master connections) but was dropped
when that PR was rebased after the TLS fork/pipe changes (5a47794).
Now that RdbPipeCleanup no longer calls checkChildrenDone, and the ACK
has chance to detect that the child exited, it should be the one to call
it so that we don't have to wait for cron (server.hz) to do that.
2020-09-06 09:43:57 -04:00
|
|
|
|
2021-05-26 07:51:53 -04:00
|
|
|
test "diskless replication read pipe cleanup" {
|
|
|
|
# In diskless replication, we create a read pipe for the RDB, between the child and the parent.
|
|
|
|
# When we close this pipe (fd), the read handler also needs to be removed from the event loop (if it still registered).
|
|
|
|
# Otherwise, next time we will use the same fd, the registration will be fail (panic), because
|
|
|
|
# we will use EPOLL_CTL_MOD (the fd still register in the event loop), on fd that already removed from epoll_ctl
|
|
|
|
start_server {tags {"repl"}} {
|
|
|
|
set master [srv 0 client]
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
set master_pid [srv 0 pid]
|
|
|
|
$master config set repl-diskless-sync yes
|
|
|
|
$master config set repl-diskless-sync-delay 0
|
|
|
|
|
|
|
|
# put enough data in the db, and slowdown the save, to keep the parent busy at the read process
|
|
|
|
$master config set rdb-key-save-delay 100000
|
|
|
|
$master debug populate 20000 test 10000
|
|
|
|
$master config set rdbcompression no
|
|
|
|
start_server {} {
|
|
|
|
set replica [srv 0 client]
|
|
|
|
set loglines [count_log_lines 0]
|
|
|
|
$replica config set repl-diskless-load swapdb
|
|
|
|
$replica replicaof $master_host $master_port
|
|
|
|
|
|
|
|
# wait for the replicas to start reading the rdb
|
|
|
|
wait_for_log_messages 0 {"*Loading DB in memory*"} $loglines 800 10
|
|
|
|
|
2021-09-19 05:07:04 -04:00
|
|
|
set loglines [count_log_lines -1]
|
2021-05-26 07:51:53 -04:00
|
|
|
# send FLUSHALL so the RDB child will be killed
|
|
|
|
$master flushall
|
|
|
|
|
|
|
|
# wait for another RDB child process to be started
|
|
|
|
wait_for_log_messages -1 {"*Background RDB transfer started by pid*"} $loglines 800 10
|
|
|
|
|
|
|
|
# make sure master is alive
|
|
|
|
$master ping
|
|
|
|
}
|
|
|
|
}
|
2021-06-09 08:13:24 -04:00
|
|
|
} {} {external:skip}
|
2021-05-26 07:51:53 -04:00
|
|
|
|
2020-05-17 11:26:02 -04:00
|
|
|
test {replicaof right after disconnection} {
|
|
|
|
# this is a rare race condition that was reproduced sporadically by the psync2 unit.
|
|
|
|
# see details in #7205
|
|
|
|
start_server {tags {"repl"}} {
|
|
|
|
set replica1 [srv 0 client]
|
|
|
|
set replica1_host [srv 0 host]
|
|
|
|
set replica1_port [srv 0 port]
|
|
|
|
set replica1_log [srv 0 stdout]
|
|
|
|
start_server {} {
|
|
|
|
set replica2 [srv 0 client]
|
|
|
|
set replica2_host [srv 0 host]
|
|
|
|
set replica2_port [srv 0 port]
|
|
|
|
set replica2_log [srv 0 stdout]
|
|
|
|
start_server {} {
|
|
|
|
set master [srv 0 client]
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
$replica1 replicaof $master_host $master_port
|
|
|
|
$replica2 replicaof $master_host $master_port
|
|
|
|
|
|
|
|
wait_for_condition 50 100 {
|
|
|
|
[string match {*master_link_status:up*} [$replica1 info replication]] &&
|
|
|
|
[string match {*master_link_status:up*} [$replica2 info replication]]
|
|
|
|
} else {
|
|
|
|
fail "Can't turn the instance into a replica"
|
|
|
|
}
|
|
|
|
|
|
|
|
set rd [redis_deferring_client -1]
|
|
|
|
$rd debug sleep 1
|
|
|
|
after 100
|
|
|
|
|
|
|
|
# when replica2 will wake up from the sleep it will find both disconnection
|
|
|
|
# from it's master and also a replicaof command at the same event loop
|
|
|
|
$master client kill type replica
|
|
|
|
$replica2 replicaof $replica1_host $replica1_port
|
|
|
|
$rd read
|
|
|
|
|
|
|
|
wait_for_condition 50 100 {
|
|
|
|
[string match {*master_link_status:up*} [$replica2 info replication]]
|
|
|
|
} else {
|
|
|
|
fail "role change failed."
|
|
|
|
}
|
|
|
|
|
|
|
|
# make sure psync succeeded, and there were no unexpected full syncs.
|
|
|
|
assert_equal [status $master sync_full] 2
|
|
|
|
assert_equal [status $replica1 sync_full] 0
|
|
|
|
assert_equal [status $replica2 sync_full] 0
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-06-09 08:13:24 -04:00
|
|
|
} {} {external:skip}
|
2020-09-22 02:47:58 -04:00
|
|
|
|
|
|
|
test {Kill rdb child process if its dumping RDB is not useful} {
|
|
|
|
start_server {tags {"repl"}} {
|
|
|
|
set slave1 [srv 0 client]
|
|
|
|
start_server {} {
|
|
|
|
set slave2 [srv 0 client]
|
|
|
|
start_server {} {
|
|
|
|
set master [srv 0 client]
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
for {set i 0} {$i < 10} {incr i} {
|
|
|
|
$master set $i $i
|
|
|
|
}
|
|
|
|
# Generating RDB will cost 10s(10 * 1s)
|
|
|
|
$master config set rdb-key-save-delay 1000000
|
|
|
|
$master config set repl-diskless-sync no
|
|
|
|
$master config set save ""
|
|
|
|
|
|
|
|
$slave1 slaveof $master_host $master_port
|
|
|
|
$slave2 slaveof $master_host $master_port
|
|
|
|
|
|
|
|
# Wait for starting child
|
|
|
|
wait_for_condition 50 100 {
|
2020-10-27 03:36:42 -04:00
|
|
|
([s 0 rdb_bgsave_in_progress] == 1) &&
|
|
|
|
([string match "*wait_bgsave*" [s 0 slave0]]) &&
|
|
|
|
([string match "*wait_bgsave*" [s 0 slave1]])
|
2020-09-22 02:47:58 -04:00
|
|
|
} else {
|
|
|
|
fail "rdb child didn't start"
|
|
|
|
}
|
|
|
|
|
|
|
|
# Slave1 disconnect with master
|
|
|
|
$slave1 slaveof no one
|
|
|
|
# Shouldn't kill child since another slave wait for rdb
|
|
|
|
after 100
|
|
|
|
assert {[s 0 rdb_bgsave_in_progress] == 1}
|
|
|
|
|
|
|
|
# Slave2 disconnect with master
|
|
|
|
$slave2 slaveof no one
|
|
|
|
# Should kill child
|
2021-05-18 10:13:59 -04:00
|
|
|
wait_for_condition 100 10 {
|
2020-09-22 02:47:58 -04:00
|
|
|
[s 0 rdb_bgsave_in_progress] eq 0
|
|
|
|
} else {
|
|
|
|
fail "can't kill rdb child"
|
|
|
|
}
|
|
|
|
|
|
|
|
# If have save parameters, won't kill child
|
|
|
|
$master config set save "900 1"
|
|
|
|
$slave1 slaveof $master_host $master_port
|
|
|
|
$slave2 slaveof $master_host $master_port
|
|
|
|
wait_for_condition 50 100 {
|
2020-10-27 03:36:42 -04:00
|
|
|
([s 0 rdb_bgsave_in_progress] == 1) &&
|
|
|
|
([string match "*wait_bgsave*" [s 0 slave0]]) &&
|
|
|
|
([string match "*wait_bgsave*" [s 0 slave1]])
|
2020-09-22 02:47:58 -04:00
|
|
|
} else {
|
|
|
|
fail "rdb child didn't start"
|
|
|
|
}
|
|
|
|
$slave1 slaveof no one
|
|
|
|
$slave2 slaveof no one
|
|
|
|
after 200
|
|
|
|
assert {[s 0 rdb_bgsave_in_progress] == 1}
|
|
|
|
catch {$master shutdown nosave}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-06-09 08:13:24 -04:00
|
|
|
} {} {external:skip}
|
2021-09-09 04:32:29 -04:00
|
|
|
|
|
|
|
start_server {tags {"repl external:skip"}} {
|
|
|
|
set master1_host [srv 0 host]
|
|
|
|
set master1_port [srv 0 port]
|
|
|
|
r set a b
|
|
|
|
|
|
|
|
start_server {} {
|
|
|
|
set master2 [srv 0 client]
|
|
|
|
set master2_host [srv 0 host]
|
|
|
|
set master2_port [srv 0 port]
|
|
|
|
# Take 10s for dumping RDB
|
|
|
|
$master2 debug populate 10 master2 10
|
|
|
|
$master2 config set rdb-key-save-delay 1000000
|
|
|
|
|
|
|
|
start_server {} {
|
|
|
|
set sub_replica [srv 0 client]
|
|
|
|
|
|
|
|
start_server {} {
|
|
|
|
# Full sync with master1
|
|
|
|
r slaveof $master1_host $master1_port
|
|
|
|
wait_for_sync r
|
|
|
|
assert_equal "b" [r get a]
|
|
|
|
|
|
|
|
# Let sub replicas sync with me
|
|
|
|
$sub_replica slaveof [srv 0 host] [srv 0 port]
|
|
|
|
wait_for_sync $sub_replica
|
|
|
|
assert_equal "b" [$sub_replica get a]
|
|
|
|
|
|
|
|
# Full sync with master2, and then kill master2 before finishing dumping RDB
|
|
|
|
r slaveof $master2_host $master2_port
|
|
|
|
wait_for_condition 50 100 {
|
|
|
|
([s -2 rdb_bgsave_in_progress] == 1) &&
|
|
|
|
([string match "*wait_bgsave*" [s -2 slave0]])
|
|
|
|
} else {
|
|
|
|
fail "full sync didn't start"
|
|
|
|
}
|
|
|
|
catch {$master2 shutdown nosave}
|
|
|
|
|
|
|
|
test {Don't disconnect with replicas before loading transferred RDB when full sync} {
|
|
|
|
assert ![log_file_matches [srv -1 stdout] "*Connection with master lost*"]
|
|
|
|
# The replication id is not changed in entire replication chain
|
|
|
|
assert_equal [s master_replid] [s -3 master_replid]
|
|
|
|
assert_equal [s master_replid] [s -1 master_replid]
|
|
|
|
}
|
|
|
|
|
|
|
|
test {Discard cache master before loading transferred RDB when full sync} {
|
|
|
|
set full_sync [s -3 sync_full]
|
|
|
|
set partial_sync [s -3 sync_partial_ok]
|
|
|
|
# Partial sync with master1
|
|
|
|
r slaveof $master1_host $master1_port
|
|
|
|
wait_for_sync r
|
|
|
|
# master1 accepts partial sync instead of full sync
|
|
|
|
assert_equal $full_sync [s -3 sync_full]
|
|
|
|
assert_equal [expr $partial_sync+1] [s -3 sync_partial_ok]
|
|
|
|
|
|
|
|
# Since master only partially sync replica, and repl id is not changed,
|
|
|
|
# the replica doesn't disconnect with its sub-replicas
|
|
|
|
assert_equal [s master_replid] [s -3 master_replid]
|
|
|
|
assert_equal [s master_replid] [s -1 master_replid]
|
|
|
|
assert ![log_file_matches [srv -1 stdout] "*Connection with master lost*"]
|
|
|
|
# Sub replica just has one full sync, no partial resync.
|
|
|
|
assert_equal 1 [s sync_full]
|
|
|
|
assert_equal 0 [s sync_partial_ok]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-11-04 03:09:28 -04:00
|
|
|
|
|
|
|
test {replica can handle EINTR if use diskless load} {
|
|
|
|
start_server {tags {"repl"}} {
|
|
|
|
set replica [srv 0 client]
|
|
|
|
set replica_log [srv 0 stdout]
|
|
|
|
start_server {} {
|
|
|
|
set master [srv 0 client]
|
|
|
|
set master_host [srv 0 host]
|
|
|
|
set master_port [srv 0 port]
|
|
|
|
|
|
|
|
$master debug populate 100 master 100000
|
|
|
|
$master config set rdbcompression no
|
|
|
|
$master config set repl-diskless-sync yes
|
|
|
|
$master config set repl-diskless-sync-delay 0
|
|
|
|
$replica config set repl-diskless-load on-empty-db
|
|
|
|
# Construct EINTR error by using the built in watchdog
|
|
|
|
$replica config set watchdog-period 200
|
|
|
|
# Block replica in read()
|
|
|
|
$master config set rdb-key-save-delay 10000
|
|
|
|
# set speedy shutdown
|
|
|
|
$master config set save ""
|
|
|
|
# Start the replication process...
|
|
|
|
$replica replicaof $master_host $master_port
|
|
|
|
|
|
|
|
# Wait for the replica to start reading the rdb
|
|
|
|
set res [wait_for_log_messages -1 {"*Loading DB in memory*"} 0 200 10]
|
|
|
|
set loglines [lindex $res 1]
|
|
|
|
|
|
|
|
# Wait till we see the watchgod log line AFTER the loading started
|
|
|
|
wait_for_log_messages -1 {"*WATCHDOG TIMER EXPIRED*"} $loglines 200 10
|
|
|
|
|
|
|
|
# Make sure we're still loading, and that there was just one full sync attempt
|
|
|
|
assert ![log_file_matches [srv -1 stdout] "*Reconnecting to MASTER*"]
|
|
|
|
assert_equal 1 [s 0 sync_full]
|
|
|
|
assert_equal 1 [s -1 loading]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} {} {external:skip}
|