Skip to content

Commit 5411d92

Browse files
committed
Fix Test rdb-channel psync established after rdb load
Signed-off-by: naglera <[email protected]>
1 parent a331234 commit 5411d92

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

tests/integration/repl-rdb-channel.tcl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,14 +370,13 @@ start_server {tags {"repl rdb-channel external:skip"}} {
370370
test "Test rdb-channel psync established after rdb load" {
371371
$replica slaveof $master_host $master_port
372372

373-
wait_for_value_to_propegate_to_replica $master $replica "key1"
374-
375373
verify_replica_online $master 0 500
376374
wait_for_condition 50 1000 {
377375
[status $replica master_link_status] == "up"
378376
} else {
379377
fail "Replica is not synced"
380378
}
379+
wait_for_value_to_propegate_to_replica $master $replica "key1"
381380
# Confirm the occurrence of a race condition.
382381
set res [wait_for_log_messages -1 {"*RDB channel sync - psync established after rdb load*"} $loglines 2000 1]
383382
set loglines [lindex $res 1]

tests/support/test.tcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,11 @@ proc verify_replica_online {master replica_idx max_retry} {
161161
}
162162

163163
proc wait_for_value_to_propegate_to_replica {master replica key} {
164-
set val [$master get key]
165-
wait_for_condition 50 1000 {
164+
set val [$master get $key]
165+
wait_for_condition 50 500 {
166166
([$replica get $key] eq $val)
167167
} else {
168-
error "key $key did not propegate"
168+
error "Key $key did not propegate. Expected $val but got [$replica get $key]"
169169
}
170170
}
171171

0 commit comments

Comments
 (0)