From: antirez <antirez@gmail.com>
Date: Wed, 29 Jun 2011 14:10:28 +0000 (+0200)
Subject: Partial fix for a problem with AOF and BRPOP. We have at least a single evidence... 
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/ef67a2fc3c24d346efb1fa73b822e6a160229166

Partial fix for a problem with AOF and BRPOP. We have at least a single evidence of an AOF that ended with a BRPOP call against an empty list, causing later issues at run time. Now the problem is detected while loading the AOF at startup, even if it is still to understand how the corrupted AOF was generated.
---

diff --git a/src/aof.c b/src/aof.c
index ac6b9791..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. */