summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2017-04-20 07:55:51 +0200
committerGitHub <noreply@github.com>2017-04-20 07:55:51 +0200
commit3773c06d281bd50717280df171ba6dcf44a4116a (patch)
tree9a26a94257ef15b232c192d8c92f9f1dcd8ac3cf
parent7d9dd80db3c4bc028072071d87bd97ea171195f5 (diff)
parent5f88bd320eb56e6c65a44651042ec14b64823763 (diff)
downloadredis-3773c06d281bd50717280df171ba6dcf44a4116a.tar.gz
Merge pull request #3950 from kensou97/unstable
update block->free after some diff data are written to the child process
-rw-r--r--src/aof.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/aof.c b/src/aof.c
index f73da1e25..9b15ad1d0 100644
--- a/src/aof.c
+++ b/src/aof.c
@@ -115,6 +115,7 @@ void aofChildWriteDiffData(aeEventLoop *el, int fd, void *privdata, int mask) {
if (nwritten <= 0) return;
memmove(block->buf,block->buf+nwritten,block->used-nwritten);
block->used -= nwritten;
+ block->free += nwritten;
}
if (block->used == 0) listDelNode(server.aof_rewrite_buf_blocks,ln);
}