Two fixes for replication: Slave performs the AOF rewrite at the right point. Non...

[redis.git] / src / aof.c

diff --git a/src/aof.c b/src/aof.c
index cd7c48d3f0dfe76d24cd5ce0f10346f56c1f3ec5..cd409a0b376d85d2df9bdc6e583abd8e3b6aacb9 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -284,9 +284,11 @@ int loadAppendOnlyFile(char *filename) {
         /* The fake client should not have a reply */
         redisAssert(fakeClient->bufpos == 0 && listLength(fakeClient->reply) == 0);
 
         /* The fake client should not have a reply */
         redisAssert(fakeClient->bufpos == 0 && listLength(fakeClient->reply) == 0);
 

-        /* Clean up, ready for the next command */
-        for (j = 0; j < argc; j++) decrRefCount(argv[j]);
-        zfree(argv);
+        /* Clean up. Command code may have changed argv/argc so we use the
+         * argv/argc of the client instead of the local variables. */
+        for (j = 0; j < fakeClient->argc; j++)
+            decrRefCount(fakeClient->argv[j]);
+        zfree(fakeClient->argv);

     }
 
     /* This point can only be reached when EOF is reached without errors.
     }
 
     /* This point can only be reached when EOF is reached without errors.


@@ -346,7 +348,7 @@ int rewriteAppendOnlyFile(char *filename) {
 
         /* Iterate this DB writing every entry */
         while((de = dictNext(di)) != NULL) {
 
         /* Iterate this DB writing every entry */
         while((de = dictNext(di)) != NULL) {

-            sds keystr = dictGetEntryKey(de);
+            sds keystr;

             robj key, *o;
             time_t expiretime;
 
             robj key, *o;
             time_t expiretime;
 


@@ -460,7 +462,7 @@ int rewriteAppendOnlyFile(char *filename) {
                         }
                         zzlNext(zl,&eptr,&sptr);
                     }
                         }
                         zzlNext(zl,&eptr,&sptr);
                     }

-                } else if (o->encoding == REDIS_ENCODING_RAW) {
+                } else if (o->encoding == REDIS_ENCODING_SKIPLIST) {

                     zset *zs = o->ptr;
                     dictIterator *di = dictGetIterator(zs->dict);
                     dictEntry *de;
                     zset *zs = o->ptr;
                     dictIterator *di = dictGetIterator(zs->dict);
                     dictEntry *de;


@@ -563,16 +565,18 @@ werr:
  */
 int rewriteAppendOnlyFileBackground(void) {
     pid_t childpid;
  */
 int rewriteAppendOnlyFileBackground(void) {
     pid_t childpid;

+    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;
     }
 
     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) {
     if ((childpid = fork()) == 0) {

-        /* Child */

         char tmpfile[256];
 
         char tmpfile[256];
 

+        /* Child */

         if (server.ipfd > 0) close(server.ipfd);
         if (server.sofd > 0) close(server.sofd);
         snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) getpid());
         if (server.ipfd > 0) close(server.ipfd);
         if (server.sofd > 0) close(server.sofd);
         snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) getpid());


@@ -583,6 +587,7 @@ int rewriteAppendOnlyFileBackground(void) {
         }
     } else {
         /* Parent */
         }
     } else {
         /* Parent */

+        server.stat_fork_time = ustime()-start;

         if (childpid == -1) {
             redisLog(REDIS_WARNING,
                 "Can't rewrite append only file in background: fork: %s",
         if (childpid == -1) {
             redisLog(REDIS_WARNING,
                 "Can't rewrite append only file in background: fork: %s",