summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorheqin <hqin6@163.com>2017-12-18 17:59:03 +0800
committerheqin <hqin6@163.com>2017-12-18 17:59:03 +0800
commit365e6c45ea0d5d9d72ac18b1df729f536c1fa0a1 (patch)
tree8d0f03db8d9b4cc5d6f9e7fee7a1fcc52db36d33
parentee724cac491c6e6f4ee3c9b91be482f163e6d12c (diff)
downloadredis-365e6c45ea0d5d9d72ac18b1df729f536c1fa0a1.tar.gz
fixbug for #4545 dead loop aof rewrite
-rw-r--r--src/server.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server.c b/src/server.c
index b8f43b3a0..f40a7be55 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1119,7 +1119,9 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
}
/* Trigger an AOF rewrite if needed */
- if (server.rdb_child_pid == -1 &&
+ // If AOF disabled, we don't rewrite AOF file.
+ if (server.aof_fd != -1 &&
+ server.rdb_child_pid == -1 &&
server.aof_child_pid == -1 &&
server.aof_rewrite_perc &&
server.aof_current_size > server.aof_rewrite_min_size)