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
d5a35c39
Commit
d5a35c39
authored
Apr 01, 2015
by
Salvatore Sanfilippo
Browse files
Merge pull request #2485 from oranagra/diskless-repl-fixes
fixes to diskless replication.
parents
38680424
159875b5
Changes
2
Show whitespace changes
Inline
Side-by-side
src/networking.c
View file @
d5a35c39
...
...
@@ -149,7 +149,7 @@ int prepareClientToWrite(redisClient *c) {
if (c->fd <= 0) return REDIS_ERR; /* Fake client */
if (c->bufpos == 0 && listLength(c->reply) == 0 &&
(c->replstate == REDIS_REPL_NONE ||
c
->
replstate
==
REDIS_REPL_ONLINE
)
&&
c->replstate == REDIS_REPL_ONLINE) &&
!c->repl_put_online_on_ack &&
aeCreateFileEvent(server.el, c->fd, AE_WRITABLE,
sendReplyToClient, c) == AE_ERR) return REDIS_ERR;
return REDIS_OK;
...
...
src/replication.c
View file @
d5a35c39
...
...
@@ -773,6 +773,7 @@ void updateSlavesWaitingBgsave(int bgsaveerr, int type) {
* is technically online now. */
slave
->
replstate
=
REDIS_REPL_ONLINE
;
slave
->
repl_put_online_on_ack
=
1
;
slave
->
repl_ack_time
=
server
.
unixtime
;
}
else
{
if
(
bgsaveerr
!=
REDIS_OK
)
{
freeClient
(
slave
);
...
...
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