From ff024e3064b392018623209279284568caff899e Mon Sep 17 00:00:00 2001 From: antirez Date: Wed, 4 Mar 2020 11:19:55 +0100 Subject: Log RDB deletion in persistence-less instances. --- src/replication.c | 17 +++++++++++++++-- 1 file 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; -- cgit v1.2.1