Skip to content

Commit c8f099f

Browse files
committed
Fixed the set-active-expire problem in the psync2 test
Signed-off-by: Hanxi Zhang <hanxizh@amazon.com>
1 parent e09ac21 commit c8f099f

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

tests/unit/hashexpire.tcl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4632,6 +4632,8 @@ start_server {} {
46324632
restart_server 0 true false
46334633
set primary [srv 0 client]
46344634
}
4635+
4636+
$primary debug set-active-expire 0
46354637

46364638
# Wait for replicas to reconnect
46374639
wait_for_condition 50 1000 {
@@ -4641,9 +4643,6 @@ start_server {} {
46414643
fail "Replicas didn't sync after master restart"
46424644
}
46434645

4644-
# Re-enable active expiration
4645-
$primary debug set-active-expire 1
4646-
46474646
# Verify primary has only the permanent field
46484647
assert_equal 1 [$primary hlen myhash]
46494648
assert_equal "permanent_value" [$primary hget myhash permanent]
@@ -4658,7 +4657,11 @@ start_server {} {
46584657

46594658
assert_equal "permanent_value" [$replica hget myhash permanent]
46604659
assert_equal "permanent_value" [$sub_replica hget myhash permanent]
4661-
} {} {needs:debug}
4660+
4661+
# Re-enable active expiration
4662+
$primary debug set-active-expire 1
4663+
4664+
} {OK} {needs:debug}
46624665
}}}
46634666

46644667
start_server {tags {"hashexpire"}} {

0 commit comments

Comments
 (0)