Fixed init script bug, thanks to Henrik Westphal

[redis.git] / src / rdb.c

diff --git a/src/rdb.c b/src/rdb.c
index 0d4940d264e5fe55828e760d16b40970c19e7ee6..a2471aef63da2a78efe830574a2f4fdf30c8fce4 100644 (file)
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -1038,9 +1038,9 @@ void saveCommand(redisClient *c) {
 void bgsaveCommand(redisClient *c) {
     if (server.bgsavechildpid != -1 || server.bgsavethread != (pthread_t)-1) {
         addReplyError(c,"Background save already in progress");
-        return;
-    }
-    if (rdbSaveBackground(server.dbfilename) == REDIS_OK) {
+    } else if (server.bgrewritechildpid != -1) {
+        addReplyError(c,"Can't BGSAVE while AOF log rewriting is in progress");
+    } else if (rdbSaveBackground(server.dbfilename) == REDIS_OK) {
         addReplyStatus(c,"Background saving started");
     } else {
         addReply(c,shared.err);