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
652c5322
Unverified
Commit
652c5322
authored
Feb 27, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Feb 27, 2020
Browse files
Merge pull request #6785 from patpatbear/issue_#6696_fix_aof_child_whitelist_SIGUSR1
fix impl of aof-child whitelist SIGUSR1 feature.
parents
ca825701
dd05b7f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/aof.c
View file @
652c5322
...
...
@@ -1798,14 +1798,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
);
...
...
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