Don't build a reply when replaying the AOF

diff --git a/src/aof.c b/src/aof.c
index 8f2dc96f3cd5a22ad0641b3593d5c03ea995d4ce..1ed2363ad8efd9309e3f8a68386fcfb5cec58330 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -272,12 +272,14 @@ int loadAppendOnlyFile(char *filename) {
         fakeClient->argc = argc;
         fakeClient->argv = argv;
         cmd->proc(fakeClient);
         fakeClient->argc = argc;
         fakeClient->argv = argv;
         cmd->proc(fakeClient);

-        /* Discard the reply objects list from the fake client */
-        while(listLength(fakeClient->reply))
-            listDelNode(fakeClient->reply,listFirst(fakeClient->reply));
+
+        /* 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, ready for the next command */
         for (j = 0; j < argc; j++) decrRefCount(argv[j]);
         zfree(argv);

+

         /* Handle swapping while loading big datasets when VM is on */
         force_swapout = 0;
         if ((zmalloc_used_memory() - server.vm_max_memory) > 1024*1024*32)
         /* Handle swapping while loading big datasets when VM is on */
         force_swapout = 0;
         if ((zmalloc_used_memory() - server.vm_max_memory) > 1024*1024*32)

diff --git a/src/networking.c b/src/networking.c
index 464d5e02cc8f9ff95940dbf25e412bce8bf27ec0..971cbfc1cabd08102e124b8f0e51d1486063303c 100644 (file)
--- a/src/networking.c
+++ b/src/networking.c
@@ -62,6 +62,7 @@ redisClient *createClient(int fd) {
 }
 
 int _ensureFileEvent(redisClient *c) {
 }
 
 int _ensureFileEvent(redisClient *c) {

+    if (c->fd <= 0) return REDIS_ERR;

     if (c->bufpos == 0 && listLength(c->reply) == 0 &&
         (c->replstate == REDIS_REPL_NONE ||
          c->replstate == REDIS_REPL_ONLINE) &&
     if (c->bufpos == 0 && listLength(c->reply) == 0 &&
         (c->replstate == REDIS_REPL_NONE ||
          c->replstate == REDIS_REPL_ONLINE) &&