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
39e87e10
Commit
39e87e10
authored
Nov 13, 2015
by
antirez
Browse files
AOF: rewriting child killed by SIGUSR1 is not an error.
parent
828a87ba
Changes
1
Show whitespace changes
Inline
Side-by-side
src/aof.c
View file @
39e87e10
...
@@ -1459,8 +1459,10 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
...
@@ -1459,8 +1459,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) {
/* 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;
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 {
...
...
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