AOF: rewriting child killed by SIGUSR1 is not an error.
This commit is contained in:
parent
54f5ecfd49
commit
8a0258aa43
@ -1455,8 +1455,10 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
|
|||||||
serverLog(LL_VERBOSE,
|
serverLog(LL_VERBOSE,
|
||||||
"Background AOF rewrite signal handler took %lldus", ustime()-now);
|
"Background AOF rewrite signal handler took %lldus", ustime()-now);
|
||||||
} else if (!bysignal && exitcode != 0) {
|
} else if (!bysignal && exitcode != 0) {
|
||||||
server.aof_lastbgrewrite_status = C_ERR;
|
/* SIGUSR1 is whitelisted, so we have a way to kill a child without
|
||||||
|
* tirggering an error conditon. */
|
||||||
|
if (bysignal != SIGUSR1)
|
||||||
|
server.aof_lastbgrewrite_status = C_ERR;
|
||||||
serverLog(LL_WARNING,
|
serverLog(LL_WARNING,
|
||||||
"Background AOF rewrite terminated with error");
|
"Background AOF rewrite terminated with error");
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user