Merge branch 'issue327' into unstable

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index 7b023dc576e6c812c5ec21c5f39d8a13ccbbd097..b4acd6eaacd6752de9c79becc3c1f4ad5e62f116 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;


@@ -1828,7 +1832,6 @@ int freeMemoryIfNeeded(void) {
 
     /* Compute how much memory we need to free. */
     mem_tofree = mem_used - server.maxmemory;
 
     /* Compute how much memory we need to free. */
     mem_tofree = mem_used - server.maxmemory;

-    printf("USED: %zu, TOFREE: %zu\n", mem_used, mem_tofree);

     mem_freed = 0;
     while (mem_freed < mem_tofree) {
         int j, k, keys_freed = 0;
     mem_freed = 0;
     while (mem_freed < mem_tofree) {
         int j, k, keys_freed = 0;


@@ -1919,7 +1922,6 @@ int freeMemoryIfNeeded(void) {
                 delta = (long long) zmalloc_used_memory();
                 dbDelete(db,keyobj);
                 delta -= (long long) zmalloc_used_memory();
                 delta = (long long) zmalloc_used_memory();
                 dbDelete(db,keyobj);
                 delta -= (long long) zmalloc_used_memory();

-                // printf("%lld\n",delta);

                 mem_freed += delta;
                 server.stat_evictedkeys++;
                 decrRefCount(keyobj);
                 mem_freed += delta;
                 server.stat_evictedkeys++;
                 decrRefCount(keyobj);


@@ -1929,27 +1931,7 @@ int freeMemoryIfNeeded(void) {
                  * start spending so much time here that is impossible to
                  * deliver data to the slaves fast enough, so we force the
                  * transmission here inside the loop. */
                  * start spending so much time here that is impossible to
                  * deliver data to the slaves fast enough, so we force the
                  * transmission here inside the loop. */

-                if (slaves) {
-                    listIter li;
-                    listNode *ln;
-
-                    listRewind(server.slaves,&li);
-                    while((ln = listNext(&li))) {
-                        redisClient *slave = listNodeValue(ln);
-                        int events;
-
-                        events = aeGetFileEvents(server.el,slave->fd);
-                        printf("EVENTS: %d\n", events);
-                        if (events & AE_WRITABLE &&
-                            slave->replstate == REDIS_REPL_ONLINE &&
-                            listLength(slave->reply))
-                        {
-                            printf("SLAVE %d -> %d\n",
-                                slave->fd, (int) listLength(slave->reply));
-                            sendReplyToClient(server.el,slave->fd,slave,0);
-                        }
-                    }
-                }
+                if (slaves) flushSlavesOutputBuffers();

             }
         }
         if (!keys_freed) return REDIS_ERR; /* nothing to free... */
             }
         }
         if (!keys_freed) return REDIS_ERR; /* nothing to free... */