Fix bgsaveerr issue in psync wrong offset test (#11043)

The kill above is sometimes successful and sometimes already too late.
The PING in pysnc wrong offset test got rejected by bgsaveerr because
lastbgsave_status is C_ERR.

In theory, using diskless can avoid PING being affected, because when
the replica is dropped, we will kill the child with SIGUSR1, and this
will not affect lastbgsave_status.

Anyway, this kill is not particularly needed here, dropping the kill
is the best one, since we do have the waitForBgsave, so just let it
take care of the bgsave. No need for fast termination.
This commit is contained in:
Binbin 2022-07-27 19:58:25 +08:00 committed by GitHub
parent 45c99d7092
commit e7144693e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1289,7 +1289,6 @@ start_server {tags {"repl" "external:skip"}} {
verify_log_message 0 "*Replica generated a reply to command 'ping', disconnecting it: *" $lines
$rd close
catch {exec kill -9 [get_child_pid 0]}
waitForBgsave r
}
@ -1307,7 +1306,6 @@ start_server {tags {"repl" "external:skip"}} {
verify_log_message 0 "*Replica generated a reply to command 'xinfo|help', disconnecting it: *" $lines
$rd close
catch {exec kill -9 [get_child_pid 0]}
waitForBgsave r
}
@ -1328,7 +1326,6 @@ start_server {tags {"repl" "external:skip"}} {
verify_log_message 0 "*Replica can't interact with the keyspace*" $lines
$rd close
catch {exec kill -9 [get_child_pid 0]}
waitForBgsave r
}
@ -1347,7 +1344,6 @@ start_server {tags {"repl" "external:skip"}} {
verify_log_message 0 "*Replica generated a reply to command 'slowlog|get', disconnecting it: *" $lines
$rd close
catch {exec kill -9 [get_child_pid 0]}
waitForBgsave r
}