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
ee2da67c
Commit
ee2da67c
authored
Feb 23, 2017
by
oranagra
Committed by
antirez
May 13, 2019
Browse files
bugfix to restartAOF, exit will never happen since retry will get negative.
also reduce an excess sleep
parent
78022492
Changes
1
Show whitespace changes
Inline
Side-by-side
src/replication.c
View file @
ee2da67c
...
...
@@ -1090,12 +1090,13 @@ void replicationCreateMasterClient(int fd, int dbid) {
}
void
restartAOF
()
{
int
retry
=
10
;
while
(
retry
--
&&
startAppendOnly
()
==
C_ERR
)
{
unsigned
int
tries
,
max_tries
=
10
;
for
(
tries
=
0
;
tries
<
max_tries
;
++
tries
)
{
if
(
tries
)
sleep
(
1
);
if
(
startAppendOnly
()
==
C_OK
)
break
;
serverLog
(
LL_WARNING
,
"Failed enabling the AOF after successful master synchronization! Trying it again in one second."
);
sleep
(
1
);
}
if
(
!
retry
)
{
if
(
tries
==
max_tries
)
{
serverLog
(
LL_WARNING
,
"FATAL: this replica instance finished the synchronization with its master, but the AOF can't be turned on. Exiting now."
);
exit
(
1
);
}
...
...
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