gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bugfix to restartAOF, exit will never happen since retry will get negative.

Browse Source 
also reduce an excess sleep
This commit is contained in:
oranagra 2017-02-23 03:13:44 -08:00 committed by Oran Agra
parent 3eaa2cdc44
commit c9e2900efc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/replication.c
View File

@ -1091,12 +1091,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);
}