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
af7647b2
Commit
af7647b2
authored
Jun 23, 2014
by
Salvatore Sanfilippo
Browse files
Merge pull request #1829 from mattsta/stop-aof-dataloss
Cancel SHUTDOWN if initial AOF is being written
parents
1206bdf1
72980c70
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/redis.c
View file @
af7647b2
...
@@ -2288,6 +2288,12 @@ int prepareForShutdown(int flags) {
...
@@ -2288,6 +2288,12 @@ int prepareForShutdown(int flags) {
/* Kill the AOF saving child as the AOF we already have may be longer
/* Kill the AOF saving child as the AOF we already have may be longer
* but contains the full dataset anyway. */
* but contains the full dataset anyway. */
if (server.aof_child_pid != -1) {
if (server.aof_child_pid != -1) {
/* If we have AOF enabled but haven't written the AOF yet, don't
* shutdown or else the dataset will be lost. */
if (server.aof_state == REDIS_AOF_WAIT_REWRITE) {
redisLog(REDIS_WARNING, "Writing initial AOF, can't exit.");
return REDIS_ERR;
}
redisLog(REDIS_WARNING,
redisLog(REDIS_WARNING,
"There is a child rewriting the AOF. Killing it!");
"There is a child rewriting the AOF. Killing it!");
kill(server.aof_child_pid,SIGUSR1);
kill(server.aof_child_pid,SIGUSR1);
...
...
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