Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
dc899c4c
Unverified
Commit
dc899c4c
authored
Oct 27, 2020
by
Wang Yuan
Committed by
GitHub
Oct 27, 2020
Browse files
Fix timing dependence in replication tcl tests (#7969)
Remove 'fork child $pid' log in replication.tcl
parent
7fa56dd7
Changes
1
Hide whitespace changes
Inline
Side-by-side
tests/integration/replication.tcl
View file @
dc899c4c
...
@@ -725,7 +725,6 @@ test "diskless replication child being killed is collected" {
...
@@ -725,7 +725,6 @@ test "diskless replication child being killed is collected" {
# simulate the OOM killer or anyone else kills the child
# simulate the OOM killer or anyone else kills the child
set fork_child_pid
[
get_child_pid -1
]
set fork_child_pid
[
get_child_pid -1
]
puts
"fork child is
$fork
_child_pid"
exec kill -9 $fork_child_pid
exec kill -9 $fork_child_pid
# wait for the parent to notice the child have exited
# wait for the parent to notice the child have exited
...
@@ -812,7 +811,9 @@ test {Kill rdb child process if its dumping RDB is not useful} {
...
@@ -812,7 +811,9 @@ test {Kill rdb child process if its dumping RDB is not useful} {
# Wait for starting child
# Wait for starting child
wait_for_condition 50 100
{
wait_for_condition 50 100
{
[
s 0 rdb_bgsave_in_progress
]
== 1
([
s 0 rdb_bgsave_in_progress
]
== 1
)
&&
([
string match
"*wait_bgsave*"
[
s 0 slave0
]])
&&
([
string match
"*wait_bgsave*"
[
s 0 slave1
]])
}
else
{
}
else
{
fail
"rdb child didn't start"
fail
"rdb child didn't start"
}
}
...
@@ -837,7 +838,9 @@ test {Kill rdb child process if its dumping RDB is not useful} {
...
@@ -837,7 +838,9 @@ test {Kill rdb child process if its dumping RDB is not useful} {
$slave1 slaveof $master_host $master_port
$slave1 slaveof $master_host $master_port
$slave2 slaveof $master_host $master_port
$slave2 slaveof $master_host $master_port
wait_for_condition 50 100
{
wait_for_condition 50 100
{
[
s 0 rdb_bgsave_in_progress
]
== 1
([
s 0 rdb_bgsave_in_progress
]
== 1
)
&&
([
string match
"*wait_bgsave*"
[
s 0 slave0
]])
&&
([
string match
"*wait_bgsave*"
[
s 0 slave1
]])
}
else
{
}
else
{
fail
"rdb child didn't start"
fail
"rdb child didn't start"
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment