summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSalvatore Sanfilippo <antirez@gmail.com>2018-07-17 18:08:46 +0200
committerGitHub <noreply@github.com>2018-07-17 18:08:46 +0200
commit8213f64d6433509ba9cd98a993f5b4c715fef10d (patch)
tree4813e02bf31bf91a04c5bd17c868752c5096f990
parent46fd927800398f3abdf7d21a780f29fd6399519c (diff)
parent2d4366c5440ddd565e91142d59455232b6894dbd (diff)
downloadredis-8213f64d6433509ba9cd98a993f5b4c715fef10d.tar.gz
Merge pull request #5122 from trevor211/allowWritesWhenAofDisabled
Accept write commands if persisting is disabled
-rw-r--r--src/server.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server.c b/src/server.c
index 1e717b23c..dedaebdbe 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2524,7 +2524,8 @@ int processCommand(client *c) {
if (((server.stop_writes_on_bgsave_err &&
server.saveparamslen > 0 &&
server.lastbgsave_status == C_ERR) ||
- server.aof_last_write_status == C_ERR) &&
+ (server.aof_state != AOF_OFF &&
+ server.aof_last_write_status == C_ERR)) &&
server.masterhost == NULL &&
(c->cmd->flags & CMD_WRITE ||
c->cmd->proc == pingCommand))