summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2020-03-04 11:19:55 +0100
committerantirez <antirez@gmail.com>2020-03-04 11:19:55 +0100
commitff024e3064b392018623209279284568caff899e (patch)
treec5212bb8bc912e3acba6c511c9ee4e00a7bc69b4
parentf0acdee4c533164f76e28b889aa299acc5672269 (diff)
downloadredis-ff024e3064b392018623209279284568caff899e.tar.gz
Log RDB deletion in persistence-less instances.
-rw-r--r--src/replication.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/replication.c b/src/replication.c
index 8a05b9696..acecdd098 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -944,6 +944,8 @@ void removeRDBUsedToSyncReplicas(void) {
}
}
if (delrdb) {
+ serverLog(LL_NOTICE,"Removing the RDB file used to feed replicas "
+ "in a persistence-less instance");
RDBGeneratedByReplication = 0;
bg_unlink(server.rdb_filename);
}
@@ -1707,14 +1709,25 @@ void readSyncBulkPayload(connection *conn) {
"Failed trying to load the MASTER synchronization "
"DB from disk");
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,
it'll be restarted when sync succeeds or replica promoted. */
return;
}
/* 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);
close(server.repl_transfer_fd);
server.repl_transfer_fd = -1;