diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2018-01-17 11:21:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 11:21:55 +0100 |
| commit | a18e4c964e9248008e0fba7efc1cad9ba9b8b1c3 (patch) | |
| tree | 2e1262db28c346a86363a0f8ddf965aa68123436 | |
| parent | 81401878de92d15f0d3529144e27a1106ad489c2 (diff) | |
| parent | 3d3faa0a190e3ad987613b4c3f853d9ffd38a237 (diff) | |
| download | redis-a18e4c964e9248008e0fba7efc1cad9ba9b8b1c3.tar.gz | |
Merge pull request #4546 from hqin6/unstable
fixbug for #4545 dead loop aof rewrite
| -rw-r--r-- | src/server.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server.c b/src/server.c index 924fe811c..432dc7113 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_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) |