Log when the child rewriting the AOF is killed by stopAppendOnly()

[redis.git] / src / aof.c

diff --git a/src/aof.c b/src/aof.c
index bfa8163d3fd57e32d4aa2bf6b90e1ed5f840f3cc..cc7def1f69f356ae73466036ad98c9de3354a778 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -19,42 +19,48 @@ void aof_background_fsync(int fd) {
 /* Called when the user switches from "appendonly yes" to "appendonly no"
  * at runtime using the CONFIG command. */
 void stopAppendOnly(void) {
 /* Called when the user switches from "appendonly yes" to "appendonly no"
  * at runtime using the CONFIG command. */
 void stopAppendOnly(void) {

+    redisAssert(server.aof_state != REDIS_AOF_OFF);

     flushAppendOnlyFile(1);
     flushAppendOnlyFile(1);

-    aof_fsync(server.appendfd);
-    close(server.appendfd);
+    aof_fsync(server.aof_fd);
+    close(server.aof_fd);

 
 

-    server.appendfd = -1;
-    server.appendseldb = -1;
-    server.appendonly = 0;
+    server.aof_fd = -1;
+    server.aof_selected_db = -1;
+    server.aof_state = REDIS_AOF_OFF;

     /* rewrite operation in progress? kill it, wait child exit */
     /* rewrite operation in progress? kill it, wait child exit */

-    if (server.bgrewritechildpid != -1) {
+    if (server.aof_child_pid != -1) {

         int statloc;
 
         int statloc;
 

-        if (kill(server.bgrewritechildpid,SIGKILL) != -1)
+        redisLog(REDIS_NOTICE,"Killing running AOF rewrite child: %ld",
+            (long) server.aof_child_pid);
+        if (kill(server.aof_child_pid,SIGKILL) != -1)

             wait3(&statloc,0,NULL);
         /* reset the buffer accumulating changes while the child saves */
             wait3(&statloc,0,NULL);
         /* reset the buffer accumulating changes while the child saves */

-        sdsfree(server.bgrewritebuf);
-        server.bgrewritebuf = sdsempty();
-        server.bgrewritechildpid = -1;
+        sdsfree(server.aof_rewrite_buf);
+        server.aof_rewrite_buf = sdsempty();
+        aofRemoveTempFile(server.aof_child_pid);
+        server.aof_child_pid = -1;

     }
 }
 
 /* Called when the user switches from "appendonly no" to "appendonly yes"
  * at runtime using the CONFIG command. */
 int startAppendOnly(void) {
     }
 }
 
 /* Called when the user switches from "appendonly no" to "appendonly yes"
  * at runtime using the CONFIG command. */
 int startAppendOnly(void) {

-    server.appendonly = 1;
-    server.lastfsync = time(NULL);
-    server.appendfd = open(server.appendfilename,O_WRONLY|O_APPEND|O_CREAT,0644);
-    if (server.appendfd == -1) {
-        redisLog(REDIS_WARNING,"Used tried to switch on AOF via CONFIG, but I can't open the AOF file: %s",strerror(errno));
+    server.aof_last_fsync = time(NULL);
+    server.aof_fd = open(server.aof_filename,O_WRONLY|O_APPEND|O_CREAT,0644);
+    redisAssert(server.aof_state == REDIS_AOF_OFF);
+    if (server.aof_fd == -1) {
+        redisLog(REDIS_WARNING,"Redis needs to enable the AOF but can't open the append only file: %s",strerror(errno));

         return REDIS_ERR;
     }
     if (rewriteAppendOnlyFileBackground() == REDIS_ERR) {
         return REDIS_ERR;
     }
     if (rewriteAppendOnlyFileBackground() == REDIS_ERR) {

-        server.appendonly = 0;
-        close(server.appendfd);
-        redisLog(REDIS_WARNING,"User tried turning on AOF with CONFIG SET but I can't trigger a background AOF rewrite operation. Check the above logs for more info about the error.");
+        close(server.aof_fd);
+        redisLog(REDIS_WARNING,"Redis needs to enable the AOF but can't trigger a background AOF rewrite operation. Check the above logs for more info about the error.");

         return REDIS_ERR;
     }
         return REDIS_ERR;
     }

+    /* We correctly switched on AOF, now wait for the rerwite to be complete
+     * in order to append data on disk. */
+    server.aof_state = REDIS_AOF_WAIT_REWRITE;

     return REDIS_OK;
 }
 
     return REDIS_OK;
 }
 


@@ -80,12 +86,12 @@ void flushAppendOnlyFile(int force) {
     ssize_t nwritten;
     int sync_in_progress = 0;
 
     ssize_t nwritten;
     int sync_in_progress = 0;
 

-    if (sdslen(server.aofbuf) == 0) return;
+    if (sdslen(server.aof_buf) == 0) return;

 
 

-    if (server.appendfsync == APPENDFSYNC_EVERYSEC)
+    if (server.aof_fsync == AOF_FSYNC_EVERYSEC)

         sync_in_progress = bioPendingJobsOfType(REDIS_BIO_AOF_FSYNC) != 0;
 
         sync_in_progress = bioPendingJobsOfType(REDIS_BIO_AOF_FSYNC) != 0;
 

-    if (server.appendfsync == APPENDFSYNC_EVERYSEC && !force) {
+    if (server.aof_fsync == AOF_FSYNC_EVERYSEC && !force) {

         /* With this append fsync policy we do background fsyncing.
          * If the fsync is still in progress we can try to delay
          * the write for a couple of seconds. */
         /* With this append fsync policy we do background fsyncing.
          * If the fsync is still in progress we can try to delay
          * the write for a couple of seconds. */


@@ -114,8 +120,8 @@ void flushAppendOnlyFile(int force) {
      * While this will save us against the server being killed I don't think
      * there is much to do about the whole server stopping for power problems
      * or alike */
      * While this will save us against the server being killed I don't think
      * there is much to do about the whole server stopping for power problems
      * or alike */

-    nwritten = write(server.appendfd,server.aofbuf,sdslen(server.aofbuf));
-    if (nwritten != (signed)sdslen(server.aofbuf)) {
+    nwritten = write(server.aof_fd,server.aof_buf,sdslen(server.aof_buf));
+    if (nwritten != (signed)sdslen(server.aof_buf)) {

         /* Ooops, we are in troubles. The best thing to do for now is
          * aborting instead of giving the illusion that everything is
          * working as expected. */
         /* Ooops, we are in troubles. The best thing to do for now is
          * aborting instead of giving the illusion that everything is
          * working as expected. */


@@ -126,33 +132,33 @@ void flushAppendOnlyFile(int force) {
         }
         exit(1);
     }
         }
         exit(1);
     }

-    server.appendonly_current_size += nwritten;
+    server.aof_current_size += nwritten;

 
     /* Re-use AOF buffer when it is small enough. The maximum comes from the
      * arena size of 4k minus some overhead (but is otherwise arbitrary). */
 
     /* Re-use AOF buffer when it is small enough. The maximum comes from the
      * arena size of 4k minus some overhead (but is otherwise arbitrary). */

-    if ((sdslen(server.aofbuf)+sdsavail(server.aofbuf)) < 4000) {
-        sdsclear(server.aofbuf);
+    if ((sdslen(server.aof_buf)+sdsavail(server.aof_buf)) < 4000) {
+        sdsclear(server.aof_buf);

     } else {
     } else {

-        sdsfree(server.aofbuf);
-        server.aofbuf = sdsempty();
+        sdsfree(server.aof_buf);
+        server.aof_buf = sdsempty();

     }
 
     /* Don't fsync if no-appendfsync-on-rewrite is set to yes and there are
      * children doing I/O in the background. */
     }
 
     /* Don't fsync if no-appendfsync-on-rewrite is set to yes and there are
      * children doing I/O in the background. */

-    if (server.no_appendfsync_on_rewrite &&
-        (server.bgrewritechildpid != -1 || server.bgsavechildpid != -1))
+    if (server.aof_no_fsync_on_rewrite &&
+        (server.aof_child_pid != -1 || server.rdb_child_pid != -1))

             return;
 
     /* Perform the fsync if needed. */
             return;
 
     /* Perform the fsync if needed. */

-    if (server.appendfsync == APPENDFSYNC_ALWAYS) {
+    if (server.aof_fsync == AOF_FSYNC_ALWAYS) {

         /* aof_fsync is defined as fdatasync() for Linux in order to avoid
          * flushing metadata. */
         /* aof_fsync is defined as fdatasync() for Linux in order to avoid
          * flushing metadata. */

-        aof_fsync(server.appendfd); /* Let's try to get this data on the disk */
-        server.lastfsync = server.unixtime;
-    } else if ((server.appendfsync == APPENDFSYNC_EVERYSEC &&
-                server.unixtime > server.lastfsync)) {
-        if (!sync_in_progress) aof_background_fsync(server.appendfd);
-        server.lastfsync = server.unixtime;
+        aof_fsync(server.aof_fd); /* Let's try to get this data on the disk */
+        server.aof_last_fsync = server.unixtime;
+    } else if ((server.aof_fsync == AOF_FSYNC_EVERYSEC &&
+                server.unixtime > server.aof_last_fsync)) {
+        if (!sync_in_progress) aof_background_fsync(server.aof_fd);
+        server.aof_last_fsync = server.unixtime;

     }
 }
 
     }
 }
 


@@ -224,13 +230,13 @@ void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv, int a
 
     /* The DB this command was targetting is not the same as the last command
      * we appendend. To issue a SELECT command is needed. */
 
     /* The DB this command was targetting is not the same as the last command
      * we appendend. To issue a SELECT command is needed. */

-    if (dictid != server.appendseldb) {
+    if (dictid != server.aof_selected_db) {

         char seldb[64];
 
         snprintf(seldb,sizeof(seldb),"%d",dictid);
         buf = sdscatprintf(buf,"*2\r\n$6\r\nSELECT\r\n$%lu\r\n%s\r\n",
             (unsigned long)strlen(seldb),seldb);
         char seldb[64];
 
         snprintf(seldb,sizeof(seldb),"%d",dictid);
         buf = sdscatprintf(buf,"*2\r\n$6\r\nSELECT\r\n$%lu\r\n%s\r\n",
             (unsigned long)strlen(seldb),seldb);

-        server.appendseldb = dictid;
+        server.aof_selected_db = dictid;

     }
 
     if (cmd->proc == expireCommand || cmd->proc == pexpireCommand ||
     }
 
     if (cmd->proc == expireCommand || cmd->proc == pexpireCommand ||


@@ -255,14 +261,15 @@ void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv, int a
     /* Append to the AOF buffer. This will be flushed on disk just before
      * of re-entering the event loop, so before the client will get a
      * positive reply about the operation performed. */
     /* Append to the AOF buffer. This will be flushed on disk just before
      * of re-entering the event loop, so before the client will get a
      * positive reply about the operation performed. */

-    server.aofbuf = sdscatlen(server.aofbuf,buf,sdslen(buf));
+    if (server.aof_state == REDIS_AOF_ON)
+        server.aof_buf = sdscatlen(server.aof_buf,buf,sdslen(buf));

 
     /* If a background append only file rewriting is in progress we want to
      * accumulate the differences between the child DB and the current one
      * in a buffer, so that when the child process will do its work we
      * can append the differences to the new append only file. */
 
     /* If a background append only file rewriting is in progress we want to
      * accumulate the differences between the child DB and the current one
      * in a buffer, so that when the child process will do its work we
      * can append the differences to the new append only file. */

-    if (server.bgrewritechildpid != -1)
-        server.bgrewritebuf = sdscatlen(server.bgrewritebuf,buf,sdslen(buf));
+    if (server.aof_child_pid != -1)
+        server.aof_rewrite_buf = sdscatlen(server.aof_rewrite_buf,buf,sdslen(buf));

 
     sdsfree(buf);
 }
 
     sdsfree(buf);
 }


@@ -305,11 +312,11 @@ int loadAppendOnlyFile(char *filename) {
     struct redisClient *fakeClient;
     FILE *fp = fopen(filename,"r");
     struct redis_stat sb;
     struct redisClient *fakeClient;
     FILE *fp = fopen(filename,"r");
     struct redis_stat sb;

-    int appendonly = server.appendonly;
+    int old_aof_state = server.aof_state;

     long loops = 0;
 
     if (fp && redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0) {
     long loops = 0;
 
     if (fp && redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0) {

-        server.appendonly_current_size = 0;
+        server.aof_current_size = 0;

         fclose(fp);
         return REDIS_ERR;
     }
         fclose(fp);
         return REDIS_ERR;
     }


@@ -321,7 +328,7 @@ int loadAppendOnlyFile(char *filename) {
 
     /* Temporarily disable AOF, to prevent EXEC from feeding a MULTI
      * to the same file we're about to read. */
 
     /* Temporarily disable AOF, to prevent EXEC from feeding a MULTI
      * to the same file we're about to read. */

-    server.appendonly = 0;
+    server.aof_state = REDIS_AOF_OFF;

 
     fakeClient = createFakeClient();
     startLoading(fp);
 
     fakeClient = createFakeClient();
     startLoading(fp);


@@ -390,10 +397,10 @@ int loadAppendOnlyFile(char *filename) {
 
     fclose(fp);
     freeFakeClient(fakeClient);
 
     fclose(fp);
     freeFakeClient(fakeClient);

-    server.appendonly = appendonly;
+    server.aof_state = old_aof_state;

     stopLoading();
     aofUpdateCurrentSize();
     stopLoading();
     aofUpdateCurrentSize();

-    server.auto_aofrewrite_base_size = server.appendonly_current_size;
+    server.aof_rewrite_base_size = server.aof_current_size;

     return REDIS_OK;
 
 readerr:
     return REDIS_OK;
 
 readerr:


@@ -436,8 +443,8 @@ int rewriteListObject(rio *r, robj *key, robj *o) {
 
         while(ziplistGet(p,&vstr,&vlen,&vlong)) {
             if (count == 0) {
 
         while(ziplistGet(p,&vstr,&vlen,&vlong)) {
             if (count == 0) {

-                int cmd_items = (items > REDIS_AOFREWRITE_ITEMS_PER_CMD) ?
-                    REDIS_AOFREWRITE_ITEMS_PER_CMD : items;
+                int cmd_items = (items > REDIS_AOF_REWRITE_ITEMS_PER_CMD) ?
+                    REDIS_AOF_REWRITE_ITEMS_PER_CMD : items;

 
                 if (rioWriteBulkCount(r,'*',2+cmd_items) == 0) return 0;
                 if (rioWriteBulkString(r,"RPUSH",5) == 0) return 0;
 
                 if (rioWriteBulkCount(r,'*',2+cmd_items) == 0) return 0;
                 if (rioWriteBulkString(r,"RPUSH",5) == 0) return 0;


@@ -449,7 +456,7 @@ int rewriteListObject(rio *r, robj *key, robj *o) {
                 if (rioWriteBulkLongLong(r,vlong) == 0) return 0;
             }
             p = ziplistNext(zl,p);
                 if (rioWriteBulkLongLong(r,vlong) == 0) return 0;
             }
             p = ziplistNext(zl,p);

-            if (++count == REDIS_AOFREWRITE_ITEMS_PER_CMD) count = 0;
+            if (++count == REDIS_AOF_REWRITE_ITEMS_PER_CMD) count = 0;

             items--;
         }
     } else if (o->encoding == REDIS_ENCODING_LINKEDLIST) {
             items--;
         }
     } else if (o->encoding == REDIS_ENCODING_LINKEDLIST) {


@@ -462,15 +469,15 @@ int rewriteListObject(rio *r, robj *key, robj *o) {
             robj *eleobj = listNodeValue(ln);
 
             if (count == 0) {
             robj *eleobj = listNodeValue(ln);
 
             if (count == 0) {

-                int cmd_items = (items > REDIS_AOFREWRITE_ITEMS_PER_CMD) ?
-                    REDIS_AOFREWRITE_ITEMS_PER_CMD : items;
+                int cmd_items = (items > REDIS_AOF_REWRITE_ITEMS_PER_CMD) ?
+                    REDIS_AOF_REWRITE_ITEMS_PER_CMD : items;

 
                 if (rioWriteBulkCount(r,'*',2+cmd_items) == 0) return 0;
                 if (rioWriteBulkString(r,"RPUSH",5) == 0) return 0;
                 if (rioWriteBulkObject(r,key) == 0) return 0;
             }
             if (rioWriteBulkObject(r,eleobj) == 0) return 0;
 
                 if (rioWriteBulkCount(r,'*',2+cmd_items) == 0) return 0;
                 if (rioWriteBulkString(r,"RPUSH",5) == 0) return 0;
                 if (rioWriteBulkObject(r,key) == 0) return 0;
             }
             if (rioWriteBulkObject(r,eleobj) == 0) return 0;

-            if (++count == REDIS_AOFREWRITE_ITEMS_PER_CMD) count = 0;
+            if (++count == REDIS_AOF_REWRITE_ITEMS_PER_CMD) count = 0;

             items--;
         }
     } else {
             items--;
         }
     } else {


@@ -490,15 +497,15 @@ int rewriteSetObject(rio *r, robj *key, robj *o) {
 
         while(intsetGet(o->ptr,ii++,&llval)) {
             if (count == 0) {
 
         while(intsetGet(o->ptr,ii++,&llval)) {
             if (count == 0) {

-                int cmd_items = (items > REDIS_AOFREWRITE_ITEMS_PER_CMD) ?
-                    REDIS_AOFREWRITE_ITEMS_PER_CMD : items;
+                int cmd_items = (items > REDIS_AOF_REWRITE_ITEMS_PER_CMD) ?
+                    REDIS_AOF_REWRITE_ITEMS_PER_CMD : items;

 
                 if (rioWriteBulkCount(r,'*',2+cmd_items) == 0) return 0;
                 if (rioWriteBulkString(r,"SADD",4) == 0) return 0;
                 if (rioWriteBulkObject(r,key) == 0) return 0;
             }
             if (rioWriteBulkLongLong(r,llval) == 0) return 0;
 
                 if (rioWriteBulkCount(r,'*',2+cmd_items) == 0) return 0;
                 if (rioWriteBulkString(r,"SADD",4) == 0) return 0;
                 if (rioWriteBulkObject(r,key) == 0) return 0;
             }
             if (rioWriteBulkLongLong(r,llval) == 0) return 0;

-            if (++count == REDIS_AOFREWRITE_ITEMS_PER_CMD) count = 0;
+            if (++count == REDIS_AOF_REWRITE_ITEMS_PER_CMD) count = 0;

             items--;
         }
     } else if (o->encoding == REDIS_ENCODING_HT) {
             items--;
         }
     } else if (o->encoding == REDIS_ENCODING_HT) {


@@ -508,15 +515,15 @@ int rewriteSetObject(rio *r, robj *key, robj *o) {
         while((de = dictNext(di)) != NULL) {
             robj *eleobj = dictGetKey(de);
             if (count == 0) {
         while((de = dictNext(di)) != NULL) {
             robj *eleobj = dictGetKey(de);
             if (count == 0) {

-                int cmd_items = (items > REDIS_AOFREWRITE_ITEMS_PER_CMD) ?
-                    REDIS_AOFREWRITE_ITEMS_PER_CMD : items;
+                int cmd_items = (items > REDIS_AOF_REWRITE_ITEMS_PER_CMD) ?
+                    REDIS_AOF_REWRITE_ITEMS_PER_CMD : items;

 
                 if (rioWriteBulkCount(r,'*',2+cmd_items) == 0) return 0;
                 if (rioWriteBulkString(r,"SADD",4) == 0) return 0;
                 if (rioWriteBulkObject(r,key) == 0) return 0;
             }
             if (rioWriteBulkObject(r,eleobj) == 0) return 0;
 
                 if (rioWriteBulkCount(r,'*',2+cmd_items) == 0) return 0;
                 if (rioWriteBulkString(r,"SADD",4) == 0) return 0;
                 if (rioWriteBulkObject(r,key) == 0) return 0;
             }
             if (rioWriteBulkObject(r,eleobj) == 0) return 0;

-            if (++count == REDIS_AOFREWRITE_ITEMS_PER_CMD) count = 0;
+            if (++count == REDIS_AOF_REWRITE_ITEMS_PER_CMD) count = 0;

             items--;
         }
         dictReleaseIterator(di);
             items--;
         }
         dictReleaseIterator(di);


@@ -549,8 +556,8 @@ int rewriteSortedSetObject(rio *r, robj *key, robj *o) {
             score = zzlGetScore(sptr);
 
             if (count == 0) {
             score = zzlGetScore(sptr);
 
             if (count == 0) {

-                int cmd_items = (items > REDIS_AOFREWRITE_ITEMS_PER_CMD) ?
-                    REDIS_AOFREWRITE_ITEMS_PER_CMD : items;
+                int cmd_items = (items > REDIS_AOF_REWRITE_ITEMS_PER_CMD) ?
+                    REDIS_AOF_REWRITE_ITEMS_PER_CMD : items;

 
                 if (rioWriteBulkCount(r,'*',2+cmd_items*2) == 0) return 0;
                 if (rioWriteBulkString(r,"ZADD",4) == 0) return 0;
 
                 if (rioWriteBulkCount(r,'*',2+cmd_items*2) == 0) return 0;
                 if (rioWriteBulkString(r,"ZADD",4) == 0) return 0;


@@ -563,7 +570,7 @@ int rewriteSortedSetObject(rio *r, robj *key, robj *o) {
                 if (rioWriteBulkLongLong(r,vll) == 0) return 0;
             }
             zzlNext(zl,&eptr,&sptr);
                 if (rioWriteBulkLongLong(r,vll) == 0) return 0;
             }
             zzlNext(zl,&eptr,&sptr);

-            if (++count == REDIS_AOFREWRITE_ITEMS_PER_CMD) count = 0;
+            if (++count == REDIS_AOF_REWRITE_ITEMS_PER_CMD) count = 0;

             items--;
         }
     } else if (o->encoding == REDIS_ENCODING_SKIPLIST) {
             items--;
         }
     } else if (o->encoding == REDIS_ENCODING_SKIPLIST) {


@@ -576,8 +583,8 @@ int rewriteSortedSetObject(rio *r, robj *key, robj *o) {
             double *score = dictGetVal(de);
 
             if (count == 0) {
             double *score = dictGetVal(de);
 
             if (count == 0) {

-                int cmd_items = (items > REDIS_AOFREWRITE_ITEMS_PER_CMD) ?
-                    REDIS_AOFREWRITE_ITEMS_PER_CMD : items;
+                int cmd_items = (items > REDIS_AOF_REWRITE_ITEMS_PER_CMD) ?
+                    REDIS_AOF_REWRITE_ITEMS_PER_CMD : items;

 
                 if (rioWriteBulkCount(r,'*',2+cmd_items*2) == 0) return 0;
                 if (rioWriteBulkString(r,"ZADD",4) == 0) return 0;
 
                 if (rioWriteBulkCount(r,'*',2+cmd_items*2) == 0) return 0;
                 if (rioWriteBulkString(r,"ZADD",4) == 0) return 0;


@@ -585,7 +592,7 @@ int rewriteSortedSetObject(rio *r, robj *key, robj *o) {
             }
             if (rioWriteBulkDouble(r,*score) == 0) return 0;
             if (rioWriteBulkObject(r,eleobj) == 0) return 0;
             }
             if (rioWriteBulkDouble(r,*score) == 0) return 0;
             if (rioWriteBulkObject(r,eleobj) == 0) return 0;

-            if (++count == REDIS_AOFREWRITE_ITEMS_PER_CMD) count = 0;
+            if (++count == REDIS_AOF_REWRITE_ITEMS_PER_CMD) count = 0;

             items--;
         }
         dictReleaseIterator(di);
             items--;
         }
         dictReleaseIterator(di);


@@ -607,8 +614,8 @@ int rewriteHashObject(rio *r, robj *key, robj *o) {
 
         while((p = zipmapNext(p,&field,&flen,&val,&vlen)) != NULL) {
             if (count == 0) {
 
         while((p = zipmapNext(p,&field,&flen,&val,&vlen)) != NULL) {
             if (count == 0) {

-                int cmd_items = (items > REDIS_AOFREWRITE_ITEMS_PER_CMD) ?
-                    REDIS_AOFREWRITE_ITEMS_PER_CMD : items;
+                int cmd_items = (items > REDIS_AOF_REWRITE_ITEMS_PER_CMD) ?
+                    REDIS_AOF_REWRITE_ITEMS_PER_CMD : items;

 
                 if (rioWriteBulkCount(r,'*',2+cmd_items*2) == 0) return 0;
                 if (rioWriteBulkString(r,"HMSET",5) == 0) return 0;
 
                 if (rioWriteBulkCount(r,'*',2+cmd_items*2) == 0) return 0;
                 if (rioWriteBulkString(r,"HMSET",5) == 0) return 0;


@@ -616,7 +623,7 @@ int rewriteHashObject(rio *r, robj *key, robj *o) {
             }
             if (rioWriteBulkString(r,(char*)field,flen) == 0) return 0;
             if (rioWriteBulkString(r,(char*)val,vlen) == 0) return 0;
             }
             if (rioWriteBulkString(r,(char*)field,flen) == 0) return 0;
             if (rioWriteBulkString(r,(char*)val,vlen) == 0) return 0;

-            if (++count == REDIS_AOFREWRITE_ITEMS_PER_CMD) count = 0;
+            if (++count == REDIS_AOF_REWRITE_ITEMS_PER_CMD) count = 0;

             items--;
         }
     } else {
             items--;
         }
     } else {


@@ -628,8 +635,8 @@ int rewriteHashObject(rio *r, robj *key, robj *o) {
             robj *val = dictGetVal(de);
 
             if (count == 0) {
             robj *val = dictGetVal(de);
 
             if (count == 0) {

-                int cmd_items = (items > REDIS_AOFREWRITE_ITEMS_PER_CMD) ?
-                    REDIS_AOFREWRITE_ITEMS_PER_CMD : items;
+                int cmd_items = (items > REDIS_AOF_REWRITE_ITEMS_PER_CMD) ?
+                    REDIS_AOF_REWRITE_ITEMS_PER_CMD : items;

 
                 if (rioWriteBulkCount(r,'*',2+cmd_items*2) == 0) return 0;
                 if (rioWriteBulkString(r,"HMSET",5) == 0) return 0;
 
                 if (rioWriteBulkCount(r,'*',2+cmd_items*2) == 0) return 0;
                 if (rioWriteBulkString(r,"HMSET",5) == 0) return 0;


@@ -637,7 +644,7 @@ int rewriteHashObject(rio *r, robj *key, robj *o) {
             }
             if (rioWriteBulkObject(r,field) == 0) return 0;
             if (rioWriteBulkObject(r,val) == 0) return 0;
             }
             if (rioWriteBulkObject(r,field) == 0) return 0;
             if (rioWriteBulkObject(r,val) == 0) return 0;

-            if (++count == REDIS_AOFREWRITE_ITEMS_PER_CMD) count = 0;
+            if (++count == REDIS_AOF_REWRITE_ITEMS_PER_CMD) count = 0;

             items--;
         }
         dictReleaseIterator(di);
             items--;
         }
         dictReleaseIterator(di);


@@ -650,7 +657,7 @@ int rewriteHashObject(rio *r, robj *key, robj *o) {
  *
  * In order to minimize the number of commands needed in the rewritten
  * log Redis uses variadic commands when possible, such as RPUSH, SADD
  *
  * In order to minimize the number of commands needed in the rewritten
  * log Redis uses variadic commands when possible, such as RPUSH, SADD

- * and ZADD. However at max REDIS_AOFREWRITE_ITEMS_PER_CMD items per time
+ * and ZADD. However at max REDIS_AOF_REWRITE_ITEMS_PER_CMD items per time

  * are inserted using a single command. */
 int rewriteAppendOnlyFile(char *filename) {
     dictIterator *di = NULL;
  * are inserted using a single command. */
 int rewriteAppendOnlyFile(char *filename) {
     dictIterator *di = NULL;


@@ -758,10 +765,10 @@ werr:
  * 1) The user calls BGREWRITEAOF
  * 2) Redis calls this function, that forks():
  *    2a) the child rewrite the append only file in a temp file.
  * 1) The user calls BGREWRITEAOF
  * 2) Redis calls this function, that forks():
  *    2a) the child rewrite the append only file in a temp file.

- *    2b) the parent accumulates differences in server.bgrewritebuf.
+ *    2b) the parent accumulates differences in server.aof_rewrite_buf.

  * 3) When the child finished '2a' exists.
  * 4) The parent will trap the exit code, if it's OK, will append the
  * 3) When the child finished '2a' exists.
  * 4) The parent will trap the exit code, if it's OK, will append the

- *    data accumulated into server.bgrewritebuf into the temp file, and
+ *    data accumulated into server.aof_rewrite_buf into the temp file, and

  *    finally will rename(2) the temp file in the actual file name.
  *    The the new file is reopened as the new append only file. Profit!
  */
  *    finally will rename(2) the temp file in the actual file name.
  *    The the new file is reopened as the new append only file. Profit!
  */


@@ -769,7 +776,7 @@ int rewriteAppendOnlyFileBackground(void) {
     pid_t childpid;
     long long start;
 
     pid_t childpid;
     long long start;
 

-    if (server.bgrewritechildpid != -1) return REDIS_ERR;
+    if (server.aof_child_pid != -1) return REDIS_ERR;

     start = ustime();
     if ((childpid = fork()) == 0) {
         char tmpfile[256];
     start = ustime();
     if ((childpid = fork()) == 0) {
         char tmpfile[256];


@@ -794,24 +801,24 @@ int rewriteAppendOnlyFileBackground(void) {
         }
         redisLog(REDIS_NOTICE,
             "Background append only file rewriting started by pid %d",childpid);
         }
         redisLog(REDIS_NOTICE,
             "Background append only file rewriting started by pid %d",childpid);

-        server.aofrewrite_scheduled = 0;
-        server.bgrewritechildpid = childpid;
+        server.aof_rewrite_scheduled = 0;
+        server.aof_child_pid = childpid;

         updateDictResizePolicy();
         /* We set appendseldb to -1 in order to force the next call to the
          * feedAppendOnlyFile() to issue a SELECT command, so the differences
         updateDictResizePolicy();
         /* We set appendseldb to -1 in order to force the next call to the
          * feedAppendOnlyFile() to issue a SELECT command, so the differences

-         * accumulated by the parent into server.bgrewritebuf will start
+         * accumulated by the parent into server.aof_rewrite_buf will start

          * with a SELECT statement and it will be safe to merge. */
          * with a SELECT statement and it will be safe to merge. */

-        server.appendseldb = -1;
+        server.aof_selected_db = -1;

         return REDIS_OK;
     }
     return REDIS_OK; /* unreached */
 }
 
 void bgrewriteaofCommand(redisClient *c) {
         return REDIS_OK;
     }
     return REDIS_OK; /* unreached */
 }
 
 void bgrewriteaofCommand(redisClient *c) {

-    if (server.bgrewritechildpid != -1) {
+    if (server.aof_child_pid != -1) {

         addReplyError(c,"Background append only file rewriting already in progress");
         addReplyError(c,"Background append only file rewriting already in progress");

-    } else if (server.bgsavechildpid != -1) {
-        server.aofrewrite_scheduled = 1;
+    } else if (server.rdb_child_pid != -1) {
+        server.aof_rewrite_scheduled = 1;

         addReplyStatus(c,"Background append only file rewriting scheduled");
     } else if (rewriteAppendOnlyFileBackground() == REDIS_OK) {
         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");


@@ -827,18 +834,18 @@ void aofRemoveTempFile(pid_t childpid) {
     unlink(tmpfile);
 }
 
     unlink(tmpfile);
 }
 

-/* Update the server.appendonly_current_size filed explicitly using stat(2)
+/* Update the server.aof_current_size filed explicitly using stat(2)

  * to check the size of the file. This is useful after a rewrite or after
  * a restart, normally the size is updated just adding the write length
  * to the current lenght, that is much faster. */
 void aofUpdateCurrentSize(void) {
     struct redis_stat sb;
 
  * to check the size of the file. This is useful after a rewrite or after
  * a restart, normally the size is updated just adding the write length
  * to the current lenght, that is much faster. */
 void aofUpdateCurrentSize(void) {
     struct redis_stat sb;
 

-    if (redis_fstat(server.appendfd,&sb) == -1) {
+    if (redis_fstat(server.aof_fd,&sb) == -1) {

         redisLog(REDIS_WARNING,"Unable to check the AOF length: %s",
             strerror(errno));
     } else {
         redisLog(REDIS_WARNING,"Unable to check the AOF length: %s",
             strerror(errno));
     } else {

-        server.appendonly_current_size = sb.st_size;
+        server.aof_current_size = sb.st_size;

     }
 }
 
     }
 }
 


@@ -857,7 +864,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
         /* Flush the differences accumulated by the parent to the
          * rewritten AOF. */
         snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof",
         /* Flush the differences accumulated by the parent to the
          * rewritten AOF. */
         snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof",

-            (int)server.bgrewritechildpid);
+            (int)server.aof_child_pid);

         newfd = open(tmpfile,O_WRONLY|O_APPEND);
         if (newfd == -1) {
             redisLog(REDIS_WARNING,
         newfd = open(tmpfile,O_WRONLY|O_APPEND);
         if (newfd == -1) {
             redisLog(REDIS_WARNING,


@@ -865,8 +872,8 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
             goto cleanup;
         }
 
             goto cleanup;
         }
 

-        nwritten = write(newfd,server.bgrewritebuf,sdslen(server.bgrewritebuf));
-        if (nwritten != (signed)sdslen(server.bgrewritebuf)) {
+        nwritten = write(newfd,server.aof_rewrite_buf,sdslen(server.aof_rewrite_buf));
+        if (nwritten != (signed)sdslen(server.aof_rewrite_buf)) {

             if (nwritten == -1) {
                 redisLog(REDIS_WARNING,
                     "Error trying to flush the parent diff to the rewritten AOF: %s", strerror(errno));
             if (nwritten == -1) {
                 redisLog(REDIS_WARNING,
                     "Error trying to flush the parent diff to the rewritten AOF: %s", strerror(errno));


@@ -908,13 +915,13 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
          * guarantee atomicity for this switch has already happened by then, so
          * we don't care what the outcome or duration of that close operation
          * is, as long as the file descriptor is released again. */
          * guarantee atomicity for this switch has already happened by then, so
          * we don't care what the outcome or duration of that close operation
          * is, as long as the file descriptor is released again. */

-        if (server.appendfd == -1) {
+        if (server.aof_fd == -1) {

             /* AOF disabled */
 
              /* Don't care if this fails: oldfd will be -1 and we handle that.
               * One notable case of -1 return is if the old file does
               * not exist. */
             /* AOF disabled */
 
              /* Don't care if this fails: oldfd will be -1 and we handle that.
               * One notable case of -1 return is if the old file does
               * not exist. */

-             oldfd = open(server.appendfilename,O_RDONLY|O_NONBLOCK);
+             oldfd = open(server.aof_filename,O_RDONLY|O_NONBLOCK);

         } else {
             /* AOF enabled */
             oldfd = -1; /* We'll set this to the current AOF filedes later. */
         } else {
             /* AOF enabled */
             oldfd = -1; /* We'll set this to the current AOF filedes later. */


@@ -922,7 +929,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
 
         /* Rename the temporary file. This will not unlink the target file if
          * it exists, because we reference it with "oldfd". */
 
         /* Rename the temporary file. This will not unlink the target file if
          * it exists, because we reference it with "oldfd". */

-        if (rename(tmpfile,server.appendfilename) == -1) {
+        if (rename(tmpfile,server.aof_filename) == -1) {

             redisLog(REDIS_WARNING,
                 "Error trying to rename the temporary AOF: %s", strerror(errno));
             close(newfd);
             redisLog(REDIS_WARNING,
                 "Error trying to rename the temporary AOF: %s", strerror(errno));
             close(newfd);


@@ -930,29 +937,32 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
             goto cleanup;
         }
 
             goto cleanup;
         }
 

-        if (server.appendfd == -1) {
+        if (server.aof_fd == -1) {

             /* AOF disabled, we don't need to set the AOF file descriptor
              * to this new file, so we can close it. */
             close(newfd);
         } else {
             /* AOF enabled, replace the old fd with the new one. */
             /* AOF disabled, we don't need to set the AOF file descriptor
              * to this new file, so we can close it. */
             close(newfd);
         } else {
             /* AOF enabled, replace the old fd with the new one. */

-            oldfd = server.appendfd;
-            server.appendfd = newfd;
-            if (server.appendfsync == APPENDFSYNC_ALWAYS)
+            oldfd = server.aof_fd;
+            server.aof_fd = newfd;
+            if (server.aof_fsync == AOF_FSYNC_ALWAYS)

                 aof_fsync(newfd);
                 aof_fsync(newfd);

-            else if (server.appendfsync == APPENDFSYNC_EVERYSEC)
+            else if (server.aof_fsync == AOF_FSYNC_EVERYSEC)

                 aof_background_fsync(newfd);
                 aof_background_fsync(newfd);

-            server.appendseldb = -1; /* Make sure SELECT is re-issued */
+            server.aof_selected_db = -1; /* Make sure SELECT is re-issued */

             aofUpdateCurrentSize();
             aofUpdateCurrentSize();

-            server.auto_aofrewrite_base_size = server.appendonly_current_size;
+            server.aof_rewrite_base_size = server.aof_current_size;

 
             /* Clear regular AOF buffer since its contents was just written to
              * the new AOF from the background rewrite buffer. */
 
             /* Clear regular AOF buffer since its contents was just written to
              * the new AOF from the background rewrite buffer. */

-            sdsfree(server.aofbuf);
-            server.aofbuf = sdsempty();
+            sdsfree(server.aof_buf);
+            server.aof_buf = sdsempty();

         }
 
         redisLog(REDIS_NOTICE, "Background AOF rewrite successful");
         }
 
         redisLog(REDIS_NOTICE, "Background AOF rewrite successful");

+        /* Change state from WAIT_REWRITE to ON if needed */
+        if (server.aof_state == REDIS_AOF_WAIT_REWRITE)
+            server.aof_state = REDIS_AOF_ON;

 
         /* Asynchronously close the overwritten AOF. */
         if (oldfd != -1) bioCreateBackgroundJob(REDIS_BIO_CLOSE_FILE,(void*)(long)oldfd,NULL,NULL);
 
         /* Asynchronously close the overwritten AOF. */
         if (oldfd != -1) bioCreateBackgroundJob(REDIS_BIO_CLOSE_FILE,(void*)(long)oldfd,NULL,NULL);


@@ -968,8 +978,11 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
     }
 
 cleanup:
     }
 
 cleanup:

-    sdsfree(server.bgrewritebuf);
-    server.bgrewritebuf = sdsempty();
-    aofRemoveTempFile(server.bgrewritechildpid);
-    server.bgrewritechildpid = -1;
+    sdsfree(server.aof_rewrite_buf);
+    server.aof_rewrite_buf = sdsempty();
+    aofRemoveTempFile(server.aof_child_pid);
+    server.aof_child_pid = -1;
+    /* Schedule a new rewrite if we are waiting for it to switch the AOF ON. */
+    if (server.aof_state == REDIS_AOF_WAIT_REWRITE)
+        server.aof_rewrite_scheduled = 1;

 }
 }