summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsrzhao <srzhao@sysnew.com>2020-01-17 11:46:19 +0800
committerantirez <antirez@gmail.com>2020-03-05 16:30:22 +0100
commitfd4413002d89d643b273cedc8fb51e12b9ec0eb4 (patch)
tree62a6debc348dd6de3092ee958c2229bff63f174d
parent77ff332b4ce5cfbeae851e68d03bd635e961550f (diff)
downloadredis-fd4413002d89d643b273cedc8fb51e12b9ec0eb4.tar.gz
fix impl of aof-child whitelist SIGUSR1 feature.
-rw-r--r--src/aof.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/aof.c b/src/aof.c
index 810ada8cd..e70c635fa 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -1792,14 +1792,15 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
serverLog(LL_VERBOSE,
"Background AOF rewrite signal handler took %lldus", ustime()-now);
} else if (!bysignal && exitcode != 0) {
+ server.aof_lastbgrewrite_status = C_ERR;
+
+ serverLog(LL_WARNING,
+ "Background AOF rewrite terminated with error");
+ } else {
/* SIGUSR1 is whitelisted, so we have a way to kill a child without
* tirggering an error condition. */
if (bysignal != SIGUSR1)
server.aof_lastbgrewrite_status = C_ERR;
- serverLog(LL_WARNING,
- "Background AOF rewrite terminated with error");
- } else {
- server.aof_lastbgrewrite_status = C_ERR;
serverLog(LL_WARNING,
"Background AOF rewrite terminated by signal %d", bysignal);