gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rare test failures due to repl-ping-replica-period (#8393)

Browse Source 
some tests use attach_to_replication_stream to watch what's propagated
to replicas, but in some cases the periodic ping may slip in and fail
the test.
we disable that ping by setting the period to once an hour (tests should
not run for that long).

other change is so that the next time this oom-score-adj test fails,
we'll see the value (assert_equals prints it)
This commit is contained in:
Oran Agra 2021-01-25 11:05:25 +02:00 committed by GitHub
parent f225891526
commit 437e258384
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_helper.tcl
View File

@ -717,6 +717,7 @@ if {[llength $filtered_tests] < [llength $::all_tests]} {
} }
proc attach_to_replication_stream {} { proc attach_to_replication_stream {} {
r config set repl-ping-replica-period 3600
if {$::tls} { if {$::tls} {
set s [::tls::socket [srv 0 "host"] [srv 0 "port"]] set s [::tls::socket [srv 0 "host"] [srv 0 "port"]]
} else { } else {
@ -774,6 +775,7 @@ proc assert_replication_stream {s patterns} {
proc close_replication_stream {s} { proc close_replication_stream {s} {
close $s close $s
r config set repl-ping-replica-period 10
} }
# With the parallel test running multiple Redis instances at the same time # With the parallel test running multiple Redis instances at the same time

2
tests/unit/oom-score-adj.tcl
View File

@ -39,7 +39,7 @@ if {$system_name eq {linux}} {
r bgsave r bgsave
set child_pid [get_child_pid 0] set child_pid [get_child_pid 0]
assert {[get_oom_score_adj $child_pid] == [expr $base + 30]} assert_equal [get_oom_score_adj $child_pid] [expr $base + 30]
} }
# Failed oom-score-adj tests can only run unprivileged # Failed oom-score-adj tests can only run unprivileged