X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/b333e2399778e624174e00d123c2cb3785333e3d..ef9444e0d27d251672b12336ebc6568424406683:/src/aof.c

diff --git a/src/aof.c b/src/aof.c
index 78387cd3..b43f99f5 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -287,6 +287,8 @@ int loadAppendOnlyFile(char *filename) {
 
         /* The fake client should not have a reply */
         redisAssert(fakeClient->bufpos == 0 && listLength(fakeClient->reply) == 0);
+        /* The fake client should never get blocked */
+        redisAssert((fakeClient->flags & REDIS_BLOCKED) == 0);
 
         /* Clean up. Command code may have changed argv/argc so we use the
          * argv/argc of the client instead of the local variables. */
@@ -304,6 +306,7 @@ int loadAppendOnlyFile(char *filename) {
     server.appendonly = appendonly;
     stopLoading();
     aofUpdateCurrentSize();
+    server.auto_aofrewrite_base_size = server.appendonly_current_size;
     return REDIS_OK;
 
 readerr:
@@ -341,7 +344,7 @@ int rewriteAppendOnlyFile(char *filename) {
         redisDb *db = server.db+j;
         dict *d = db->dict;
         if (dictSize(d) == 0) continue;
-        di = dictGetIterator(d);
+        di = dictGetSafeIterator(d);
         if (!di) {
             fclose(fp);
             return REDIS_ERR;
@@ -573,10 +576,6 @@ int rewriteAppendOnlyFileBackground(void) {
     long long start;
 
     if (server.bgrewritechildpid != -1) return REDIS_ERR;
-    if (server.ds_enabled != 0) {
-        redisLog(REDIS_WARNING,"BGREWRITEAOF called with diskstore enabled: AOF is not supported when diskstore is enabled. Operation not performed.");
-        return REDIS_ERR;
-    }
     start = ustime();
     if ((childpid = fork()) == 0) {
         char tmpfile[256];
@@ -618,7 +617,7 @@ void bgrewriteaofCommand(redisClient *c) {
         addReplyError(c,"Background append only file rewriting already in progress");
     } else if (server.bgsavechildpid != -1) {
         server.aofrewrite_scheduled = 1;
-        addReplyStatus(c,"Background append only file rewriting started");
+        addReplyStatus(c,"Background append only file rewriting scheduled");
     } else if (rewriteAppendOnlyFileBackground() == REDIS_OK) {
         addReplyStatus(c,"Background append only file rewriting started");
     } else {
@@ -689,6 +688,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
             server.appendseldb = -1; /* Make sure it will issue SELECT */
             redisLog(REDIS_NOTICE,"The new append only file was selected for future appends.");
             aofUpdateCurrentSize();
+            server.auto_aofrewrite_base_size = server.appendonly_current_size;
         } else {
             /* If append only is disabled we just generate a dump in this
              * format. Why not? */