fixbug for #4545 dead loop aof rewrite

This commit is contained in:
heqin 2017-12-18 17:59:03 +08:00 committed by antirez
parent 5abb12e04f
commit 896cf1a9d9

View File

@ -1103,7 +1103,9 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
} }
/* Trigger an AOF rewrite if needed */ /* 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_child_pid == -1 &&
server.aof_rewrite_perc && server.aof_rewrite_perc &&
server.aof_current_size > server.aof_rewrite_min_size) server.aof_current_size > server.aof_rewrite_min_size)