diff options
author | srzhao <srzhao@sysnew.com> | 2020-01-17 11:46:19 +0800 |
---|---|---|
committer | srzhao <srzhao@sysnew.com> | 2020-01-17 11:50:51 +0800 |
commit | dd05b7f67f8191aacbbe73a1b415658233715926 (patch) | |
tree | 82aa4ff752a4feb3887245e6d87c731959193281 | |
parent | 7ef2270ee73e75b00b0c1bde40fb1df55c7ec6ff (diff) | |
download | redis-dd05b7f67f8191aacbbe73a1b415658233715926.tar.gz |
fix impl of aof-child whitelist SIGUSR1 feature.
-rw-r--r-- | src/aof.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1797,14 +1797,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); |