From 55f90b11c9ad7850ca5ea9b6504b691ebf065c3c Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 28 Nov 2013 16:25:49 +0100 Subject: [PATCH] Stop writes on MISCONF only if instance is a master. From the point of view of the slave not accepting writes from the master can only create a bigger consistency issue. --- src/redis.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/redis.c b/src/redis.c index 99ec8f60e..9d7f9164b 100644 --- a/src/redis.c +++ b/src/redis.c @@ -1992,10 +1992,12 @@ int processCommand(redisClient *c) { } } - /* Don't accept write commands if there are problems persisting on disk. */ + /* Don't accept write commands if there are problems persisting on disk + * and if this is a master instance. */ if (server.stop_writes_on_bgsave_err && server.saveparamslen > 0 && server.lastbgsave_status == REDIS_ERR && + server.masterhost != NULL && (c->cmd->flags & REDIS_CMD_WRITE || c->cmd->proc == pingCommand)) { @@ -2005,7 +2007,7 @@ int processCommand(redisClient *c) { } /* Don't accept write commands if there are not enough good slaves and - * used configured the min-slaves-to-write option. */ + * user configured the min-slaves-to-write option. */ if (server.repl_min_slaves_to_write && server.repl_min_slaves_max_lag && c->cmd->flags & REDIS_CMD_WRITE &&