Merge pull request #4546 from hqin6/unstable

fixbug for #4545 dead loop aof rewrite
This commit is contained in:
Salvatore Sanfilippo 2018-01-17 11:21:55 +01:00 committed by GitHub
commit a18e4c964e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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_state == AOF_ON &&
server.rdb_child_pid == -1 &&
server.aof_child_pid == -1 &&
server.aof_rewrite_perc &&
server.aof_current_size > server.aof_rewrite_min_size)