Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
a18e4c96
Unverified
Commit
a18e4c96
authored
Jan 17, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
Jan 17, 2018
Browse files
Merge pull request #4546 from hqin6/unstable
fixbug for #4545 dead loop aof rewrite
parents
81401878
3d3faa0a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
a18e4c96
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment