summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2018-10-31 11:46:28 +0100
committerantirez <antirez@gmail.com>2018-10-31 11:49:54 +0100
commit54b17f985d55b9e0bd8d0c98eff467f0eff22d07 (patch)
treee325247f362c6ec45f5c394d2329061103a56de0
parentb31c08db8de133ae499bfa23b681a8e6d3b2477d (diff)
downloadredis-54b17f985d55b9e0bd8d0c98eff467f0eff22d07.tar.gz
When replica kills a pending RDB save during SYNC, log it.
This logs what happens in the context of the fix in PR #5367.
-rw-r--r--src/replication.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/replication.c b/src/replication.c
index 8f49dc2fd..fa0047041 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -1246,6 +1246,12 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
/* Ensure background save doesn't overwrite synced data */
if (server.rdb_child_pid != -1) {
+ serverLog(LL_NOTICE,
+ "Replica is about to load the RDB file received from the "
+ "master, but there is a pending RDB child running. "
+ "Killing process %ld and removing its temp file to avoid "
+ "any race",
+ (long) server.rdb_child_pid);
kill(server.rdb_child_pid,SIGUSR1);
rdbRemoveTempFile(server.rdb_child_pid);
}