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
dd05b7f6
Commit
dd05b7f6
authored
Jan 17, 2020
by
srzhao
Browse files
fix impl of aof-child whitelist SIGUSR1 feature.
parent
7ef2270e
Changes
1
Show whitespace changes
Inline
Side-by-side
src/aof.c
View file @
dd05b7f6
...
@@ -1797,13 +1797,14 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
...
@@ -1797,13 +1797,14 @@ 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) {
/* 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;
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 {
/* 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;
server.aof_lastbgrewrite_status = C_ERR;
serverLog(LL_WARNING,
serverLog(LL_WARNING,
...
...
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