summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2014-07-28 14:45:31 +0200
committerSalvatore Sanfilippo <antirez@gmail.com>2014-07-28 14:45:31 +0200
commit78a012d81a0f487b92b2b79a91de1f28697100e8 (patch)
treef6dacbe6b586bef4385c5798e46676047a425164
parentc90af7cd14214e35d3a570d6619e30e965f692d6 (diff)
parenta75a57414120426012f49983cbe2b6f7f48ae741 (diff)
downloadredis-78a012d81a0f487b92b2b79a91de1f28697100e8.tar.gz
Merge pull request #1896 from yossigo/bgsave-signal-fix
Fail SYNC if background save child aborted due to a signal.
-rw-r--r--src/rdb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rdb.c b/src/rdb.c
index c0bc94311..ce5f99c9a 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -1221,7 +1221,7 @@ void backgroundSaveDoneHandler(int exitcode, int bysignal) {
server.rdb_save_time_start = -1;
/* Possibly there are slaves waiting for a BGSAVE in order to be served
* (the first stage of SYNC is a bulk transfer of dump.rdb) */
- updateSlavesWaitingBgsave(exitcode == 0 ? REDIS_OK : REDIS_ERR);
+ updateSlavesWaitingBgsave((!bysignal && exitcode == 0) ? REDIS_OK : REDIS_ERR);
}
void saveCommand(redisClient *c) {