fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 00:50:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4508 from trevor211/fixNotes

Browse Source 
fix some notes
This commit is contained in:
Salvatore Sanfilippo 2017-12-05 15:47:05 +01:00 committed by GitHub
commit c56fbb246c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redis.conf
View File

@ -296,7 +296,9 @@ dir ./
# #
# 2) if slave-serve-stale-data is set to 'no' the slave will reply with # 2) if slave-serve-stale-data is set to 'no' the slave will reply with
# an error "SYNC with master in progress" to all the kind of commands # an error "SYNC with master in progress" to all the kind of commands
# but to INFO and SLAVEOF. # but to INFO, SLAVEOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG,
# SUBSCRIBE, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB,
# COMMAND, POST, HOST: and LATENCY.
# #
slave-serve-stale-data yes slave-serve-stale-data yes

5
src/server.c
View File

@ -2478,8 +2478,9 @@ int processCommand(client *c) {
return C_OK; return C_OK;
} }
/* Only allow INFO and SLAVEOF when slave-serve-stale-data is no and /* Only allow commands with flag "t", such as INFO, SLAVEOF and so on,
* we are a slave with a broken link with master. */ * when slave-serve-stale-data is no and we are a slave with a broken
* link with master. */
if (server.masterhost && server.repl_state != REPL_STATE_CONNECTED && if (server.masterhost && server.repl_state != REPL_STATE_CONNECTED &&
server.repl_serve_stale_data == 0 && server.repl_serve_stale_data == 0 &&
!(c->cmd->flags & CMD_STALE)) !(c->cmd->flags & CMD_STALE))