Allow SHUTDOWN in loading state.

This commit is contained in:
antirez
2013-06-27 12:14:23 +02:00
parent 13585dd677
commit 3130670b97
2 changed files with 7 additions and 1 deletions

View File

@ -362,6 +362,12 @@ void shutdownCommand(redisClient *c) {
return;
}
}
/* SHUTDOWN can be called even while the server is in "loading" state.
* When this happens we need to make sure no attempt is performed to save
* the dataset on shutdown (otherwise it could overwrite the current DB
* with half-read data). */
if (server.loading)
flags = (flags & ~REDIS_SHUTDOWN_SAVE) | REDIS_SHUTDOWN_NOSAVE;
if (prepareForShutdown(flags) == REDIS_OK) exit(0);
addReplyError(c,"Errors trying to SHUTDOWN. Check logs.");
}