Merge pull request #3426 from QuChen88/3.2

Fix a bug to delay bgsave while AOF rewrite in progress for replication
This commit is contained in:
Salvatore Sanfilippo 2016-08-02 10:43:05 +02:00 committed by GitHub
commit 2444c82a3f

View File

@ -676,7 +676,7 @@ void syncCommand(client *c) {
/* Target is disk (or the slave is not capable of supporting /* Target is disk (or the slave is not capable of supporting
* diskless replication) and we don't have a BGSAVE in progress, * diskless replication) and we don't have a BGSAVE in progress,
* let's start one. */ * let's start one. */
if (server.aof_child_pid != -1) { if (server.aof_child_pid == -1) {
startBgsaveForReplication(c->slave_capa); startBgsaveForReplication(c->slave_capa);
} else { } else {
serverLog(LL_NOTICE, serverLog(LL_NOTICE,