From fda7b81f8dd26adedf6fc13793115de1f0ace195 Mon Sep 17 00:00:00 2001 From: heqin Date: Mon, 18 Dec 2017 17:59:03 +0800 Subject: [PATCH 1/2] fixbug for #4545 dead loop aof rewrite --- src/server.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) From 28405f1f75494cfae98bf4449227ab15a5f0c38c Mon Sep 17 00:00:00 2001 From: heqin Date: Wed, 17 Jan 2018 18:08:30 +0800 Subject: [PATCH 2/2] fixbug for #4545 dead loop aof rewrite --- src/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server.c b/src/server.c index f40a7be55..b144db025 100644 --- a/src/server.c +++ b/src/server.c @@ -1120,7 +1120,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { /* Trigger an AOF rewrite if needed */ // If AOF disabled, we don't rewrite AOF file. - if (server.aof_fd != -1 && + if (server.aof_state == AOF_ON && server.rdb_child_pid == -1 && server.aof_child_pid == -1 && server.aof_rewrite_perc &&