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

Log RDB deletion in persistence-less instances.

Browse Source
This commit is contained in:
antirez 2020-03-04 11:19:55 +01:00
parent f0acdee4c5
commit ff024e3064
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/replication.c
View File

@ -944,6 +944,8 @@ void removeRDBUsedToSyncReplicas(void) {
} }
} }
if (delrdb) { if (delrdb) {
serverLog(LL_NOTICE,"Removing the RDB file used to feed replicas "
"in a persistence-less instance");
RDBGeneratedByReplication = 0; RDBGeneratedByReplication = 0;
bg_unlink(server.rdb_filename); bg_unlink(server.rdb_filename);
} }
@ -1707,14 +1709,25 @@ void readSyncBulkPayload(connection *conn) {
"Failed trying to load the MASTER synchronization " "Failed trying to load the MASTER synchronization "
"DB from disk"); "DB from disk");
cancelReplicationHandshake(); cancelReplicationHandshake();
if (allPersistenceDisabled()) bg_unlink(server.rdb_filename); if (allPersistenceDisabled()) {
serverLog(LL_NOTICE,"Removing the RDB file obtained from "
"the master. This replica has persistence "
"disabled");
bg_unlink(server.rdb_filename);
}
/* Note that there's no point in restarting the AOF on sync failure, /* Note that there's no point in restarting the AOF on sync failure,
it'll be restarted when sync succeeds or replica promoted. */ it'll be restarted when sync succeeds or replica promoted. */
return; return;
} }
/* Cleanup. */ /* Cleanup. */
if (allPersistenceDisabled()) bg_unlink(server.rdb_filename); if (allPersistenceDisabled()) {
serverLog(LL_NOTICE,"Removing the RDB file obtained from "
"the master. This replica has persistence "
"disabled");
bg_unlink(server.rdb_filename);
}
zfree(server.repl_transfer_tmpfile); zfree(server.repl_transfer_tmpfile);
close(server.repl_transfer_fd); close(server.repl_transfer_fd);
server.repl_transfer_fd = -1; server.repl_transfer_fd = -1;