Fix AOF race that may duplicate commands

1 files changed, 5 insertions, 0 deletions

diff --git a/src/aof.c b/src/aof.c
index a85aa0054..0354592c1 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -795,6 +795,11 @@ void backgroundRewriteDoneHandler(int statloc) {
             server.appendseldb = -1; /* Make sure SELECT is re-issued */
             aofUpdateCurrentSize();
             server.auto_aofrewrite_base_size = server.appendonly_current_size;
+
+            /* 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();
         }
 
         redisLog(REDIS_NOTICE, "Background AOF rewrite successful");