Skip to content

Commit

Permalink
Make sure to disable pause after fork for dual channel test (#1612)
Browse files Browse the repository at this point in the history
Might close #1484.

I noticed that we don't disable pause after fork on the last test that
was getting executed, so it might getting stuck in pause loops after the
test ends if it tries another psync for any reason.

---------

Signed-off-by: Madelyn Olson <[email protected]>
  • Loading branch information
madolson authored Jan 27, 2025
1 parent a18fcdb commit 88a6830
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion tests/integration/dual-channel-replication.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -848,14 +848,14 @@ start_server {tags {"dual-channel-replication external:skip"}} {
$replica config set repl-timeout 60
$primary config set repl-backlog-size 1mb

$replica debug pause-after-fork 1
$primary debug populate 1000 primary 100000
# Set primary with a slow rdb generation, so that we can easily intercept loading
# 10ms per key, with 1000 keys is 10 seconds
$primary config set rdb-key-save-delay 10000

test "Test dual-channel-replication primary gets cob overrun during replica rdb load" {
set cur_client_closed_count [s -1 client_output_buffer_limit_disconnections]
$replica debug pause-after-fork 1
$replica replicaof $primary_host $primary_port
wait_for_condition 500 1000 {
[s -1 client_output_buffer_limit_disconnections] > $cur_client_closed_count
Expand All @@ -868,7 +868,12 @@ start_server {tags {"dual-channel-replication external:skip"}} {
} else {
fail "Primary did not free repl buf block after sync failure"
}

# Increase the delay to make sure the replica doesn't start another sync
# after it resumes after the first one.
$primary config set repl-diskless-sync-delay 100
wait_and_resume_process 0
$replica debug pause-after-fork 0
set res [wait_for_log_messages -1 {"*Unable to partial resync with replica * for lack of backlog*"} $loglines 20000 1]
set loglines [lindex $res 0]
}
Expand Down

0 comments on commit 88a6830

Please sign in to comment.