Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
c5a8c8e9
Commit
c5a8c8e9
authored
Aug 06, 2015
by
antirez
Browse files
Fixed issues introduced during last merge.
parent
4363fa1d
Changes
1
Show whitespace changes
Inline
Side-by-side
src/replication.c
View file @
c5a8c8e9
...
...
@@ -492,7 +492,7 @@ int startBgsaveForReplication(int mincapa) {
int retval;
int socket_target = server.repl_diskless_sync && (mincapa & SLAVE_CAPA_EOF);
redisLog(RE
I
DS_NOTICE,"Starting BGSAVE for SYNC with target: %s",
redisLog(RED
I
S_NOTICE,"Starting BGSAVE for SYNC with target: %s",
socket_target ? "slaves sockets" : "disk");
if (socket_target)
...
...
@@ -619,7 +619,7 @@ void syncCommand(redisClient *c) {
/* Target is disk (or the slave is not capable of supporting
* diskless replication) and we don't have a BGSAVE in progress,
* let's start one. */
if (startBgsaveForReplication(c->slave_capa) !=
C
_OK) {
if (startBgsaveForReplication(c->slave_capa) !=
REDIS
_OK) {
redisLog(REDIS_NOTICE,"Replication failed, can't BGSAVE");
addReplyError(c,"Unable to perform background save");
return;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment