Also remove size of AOF buffers from used memory when doing the math for freeMemoryIf...

diff --git a/src/redis.c b/src/redis.c
index 7b023dc576e6c812c5ec21c5f39d8a13ccbbd097..4b9ba618d570562a9c73c633d4d4fb6bcba2010a 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -1802,8 +1802,8 @@ int freeMemoryIfNeeded(void) {
     size_t mem_used, mem_tofree, mem_freed;
     int slaves = listLength(server.slaves);
 
     size_t mem_used, mem_tofree, mem_freed;
     int slaves = listLength(server.slaves);
 

-    /* Remove the size of slaves output buffers from the count of used
-     * memory. */
+    /* Remove the size of slaves output buffers and AOF buffer from the
+     * count of used memory. */

     mem_used = zmalloc_used_memory();
     if (slaves) {
         listIter li;
     mem_used = zmalloc_used_memory();
     if (slaves) {
         listIter li;


@@ -1819,6 +1819,10 @@ int freeMemoryIfNeeded(void) {
                 mem_used -= obuf_bytes;
         }
     }
                 mem_used -= obuf_bytes;
         }
     }

+    if (server.aof_state != REDIS_AOF_OFF) {
+        mem_used -= sdslen(server.aof_buf);
+        mem_used -= sdslen(server.aof_rewrite_buf);
+    }

 
     /* Check if we are over the memory limit. */
     if (mem_used <= server.maxmemory) return REDIS_OK;
 
     /* Check if we are over the memory limit. */
     if (mem_used <= server.maxmemory) return REDIS_OK;