Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
730f7c5f
Commit
730f7c5f
authored
Jul 28, 2015
by
antirez
Browse files
replicationHandleMasterDisconnection() belongs to replication.c.
parent
12d2a894
Changes
2
Show whitespace changes
Inline
Side-by-side
src/networking.c
View file @
730f7c5f
...
...
@@ -624,20 +624,6 @@ void disconnectSlaves(void) {
}
}
/* This function is called when the slave lose the connection with the
* master into an unexpected way. */
void
replicationHandleMasterDisconnection
(
void
)
{
server
.
master
=
NULL
;
server
.
repl_state
=
REDIS_REPL_CONNECT
;
server
.
repl_down_since
=
server
.
unixtime
;
/* We lost connection with our master, force our slaves to resync
* with us as well to load the new data set.
*
* If server.masterhost is NULL the user called SLAVEOF NO ONE so
* slave resync is not needed. */
if
(
server
.
masterhost
!=
NULL
)
disconnectSlaves
();
}
void
freeClient
(
redisClient
*
c
)
{
listNode
*
ln
;
...
...
src/replication.c
View file @
730f7c5f
...
...
@@ -1701,6 +1701,20 @@ void replicationUnsetMaster(void) {
server
.
repl_state
=
REDIS_REPL_NONE
;
}
/* This function is called when the slave lose the connection with the
* master into an unexpected way. */
void
replicationHandleMasterDisconnection
(
void
)
{
server
.
master
=
NULL
;
server
.
repl_state
=
REDIS_REPL_CONNECT
;
server
.
repl_down_since
=
server
.
unixtime
;
/* We lost connection with our master, force our slaves to resync
* with us as well to load the new data set.
*
* If server.masterhost is NULL the user called SLAVEOF NO ONE so
* slave resync is not needed. */
if
(
server
.
masterhost
!=
NULL
)
disconnectSlaves
();
}
void
slaveofCommand
(
redisClient
*
c
)
{
if
(
!
strcasecmp
(
c
->
argv
[
1
]
->
ptr
,
"no"
)
&&
!
strcasecmp
(
c
->
argv
[
2
]
->
ptr
,
"one"
))
{
...
...
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