summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOran Agra <oran@redislabs.com>2020-02-06 10:14:32 +0200
committerOran Agra <oran@redislabs.com>2020-02-06 10:14:32 +0200
commitaac6a4cf135aa136b339e84c23db3cfc06b4a776 (patch)
tree06c1b404dd06182f38bb2f64ef6058f55a0b78aa
parent44ac202fbfbca4210d016c9f77df987b27c1ae4c (diff)
downloadredis-aac6a4cf135aa136b339e84c23db3cfc06b4a776.tar.gz
move restartAOFAfterSYNC from replicaofCommand to replicationUnsetMaster
replicationUnsetMaster can be called from other places, not just replicaofCOmmand, and all of these need to restart AOF
-rw-r--r--src/replication.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/replication.c b/src/replication.c
index b7e77184a..5499ebc57 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -2399,6 +2399,10 @@ void replicationUnsetMaster(void) {
moduleFireServerEvent(REDISMODULE_EVENT_REPLICATION_ROLE_CHANGED,
REDISMODULE_EVENT_REPLROLECHANGED_NOW_MASTER,
NULL);
+
+ /* Restart the AOF subsystem in case we shut it down during a sync when
+ * we were still a slave. */
+ if (server.aof_enabled && server.aof_state == AOF_OFF) restartAOFAfterSYNC();
}
/* This function is called when the slave lose the connection with the
@@ -2436,9 +2440,6 @@ void replicaofCommand(client *c) {
serverLog(LL_NOTICE,"MASTER MODE enabled (user request from '%s')",
client);
sdsfree(client);
- /* Restart the AOF subsystem in case we shut it down during a sync when
- * we were still a slave. */
- if (server.aof_enabled && server.aof_state == AOF_OFF) restartAOFAfterSYNC();
}
} else {
long port;