correctly set AOF base size field in server structure

[redis.git] / src / rdb.c

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