Unverified Commit 544373ea authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #3829 from oranagra/restart_aof_pr

bugfix to restartAOF, exit will never happen
parents d75c36ee c9e2900e
...@@ -1091,12 +1091,13 @@ void replicationCreateMasterClient(int fd, int dbid) { ...@@ -1091,12 +1091,13 @@ void replicationCreateMasterClient(int fd, int dbid) {
} }
void restartAOF() { void restartAOF() {
int retry = 10; unsigned int tries, max_tries = 10;
while (retry-- && startAppendOnly() == C_ERR) { 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."); 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."); 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); exit(1);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment