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
fcac3429
Unverified
Commit
fcac3429
authored
Mar 22, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Mar 22, 2019
Browse files
Merge pull request #3830 from oranagra/diskless_capa_pr
several bugfixes to diskless replication
parents
122f4284
29b0a576
Changes
2
Show whitespace changes
Inline
Side-by-side
src/networking.c
View file @
fcac3429
...
...
@@ -911,6 +911,16 @@ void unlinkClient(client *c) {
c
->
client_list_node
=
NULL
;
}
/* In the case of diskless replication the fork is writing to the
* sockets and just closing the fd isn't enough, if we don't also
* shutdown the socket the fork will continue to write to the slave
* and the salve will only find out that it was disconnected when
* it will finish reading the rdb. */
if
((
c
->
flags
&
CLIENT_SLAVE
)
&&
(
c
->
replstate
==
SLAVE_STATE_WAIT_BGSAVE_END
))
{
shutdown
(
c
->
fd
,
SHUT_RDWR
);
}
/* Unregister async I/O handlers and close the socket. */
aeDeleteFileEvent
(
server
.
el
,
c
->
fd
,
AE_READABLE
);
aeDeleteFileEvent
(
server
.
el
,
c
->
fd
,
AE_WRITABLE
);
...
...
src/replication.c
View file @
fcac3429
...
...
@@ -593,6 +593,7 @@ int startBgsaveForReplication(int mincapa) {
client
*
slave
=
ln
->
value
;
if
(
slave
->
replstate
==
SLAVE_STATE_WAIT_BGSAVE_START
)
{
slave
->
replstate
=
REPL_STATE_NONE
;
slave
->
flags
&=
~
CLIENT_SLAVE
;
listDelNode
(
server
.
slaves
,
ln
);
addReplyError
(
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