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
004fbef8
Commit
004fbef8
authored
Mar 15, 2013
by
antirez
Browse files
Cluster: remove node from master slaves when it turns into a master.
Also, a few nearby comments improved.
parent
44c92f5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
004fbef8
...
@@ -877,11 +877,13 @@ int clusterProcessPacket(clusterLink *link) {
...
@@ -877,11 +877,13 @@ int clusterProcessPacket(clusterLink *link) {
/* Update our info about the node */
/* Update our info about the node */
if
(
link
->
node
)
link
->
node
->
pong_received
=
time
(
NULL
);
if
(
link
->
node
)
link
->
node
->
pong_received
=
time
(
NULL
);
/* Update master/slave
info
*/
/* Update master/slave
state
*/
if
(
sender
)
{
if
(
sender
)
{
if
(
!
memcmp
(
hdr
->
slaveof
,
REDIS_NODE_NULL_NAME
,
if
(
!
memcmp
(
hdr
->
slaveof
,
REDIS_NODE_NULL_NAME
,
sizeof
(
hdr
->
slaveof
)))
sizeof
(
hdr
->
slaveof
)))
{
{
if
(
sender
->
slaveof
)
clusterNodeRemoveSlave
(
sender
->
slaveof
,
sender
);
sender
->
flags
&=
~
REDIS_NODE_SLAVE
;
sender
->
flags
&=
~
REDIS_NODE_SLAVE
;
sender
->
flags
|=
REDIS_NODE_MASTER
;
sender
->
flags
|=
REDIS_NODE_MASTER
;
sender
->
slaveof
=
NULL
;
sender
->
slaveof
=
NULL
;
...
@@ -898,7 +900,9 @@ int clusterProcessPacket(clusterLink *link) {
...
@@ -898,7 +900,9 @@ int clusterProcessPacket(clusterLink *link) {
}
}
}
}
/* Update our info about served slots. */
/* Update our info about served slots.
* Note: this MUST happen after we update the master/slave state
* so that REDIS_NODE_MASTER flag will be set. */
if
(
sender
&&
sender
->
flags
&
REDIS_NODE_MASTER
)
{
if
(
sender
&&
sender
->
flags
&
REDIS_NODE_MASTER
)
{
int
changes
,
j
;
int
changes
,
j
;
...
@@ -909,7 +913,7 @@ int clusterProcessPacket(clusterLink *link) {
...
@@ -909,7 +913,7 @@ int clusterProcessPacket(clusterLink *link) {
if
(
bitmapTestBit
(
hdr
->
myslots
,
j
))
{
if
(
bitmapTestBit
(
hdr
->
myslots
,
j
))
{
/* If this slot was not served, or served by a node
/* If this slot was not served, or served by a node
* in FAIL state, update the table with the new node
* in FAIL state, update the table with the new node
* c
a
liming to serve the slot. */
* cl
a
iming to serve the slot. */
if
(
server
.
cluster
->
slots
[
j
]
==
sender
)
continue
;
if
(
server
.
cluster
->
slots
[
j
]
==
sender
)
continue
;
if
(
server
.
cluster
->
slots
[
j
]
==
NULL
||
if
(
server
.
cluster
->
slots
[
j
]
==
NULL
||
server
.
cluster
->
slots
[
j
]
->
flags
&
REDIS_NODE_FAIL
)
server
.
cluster
->
slots
[
j
]
->
flags
&
REDIS_NODE_FAIL
)
...
...
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