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
93666e58
Commit
93666e58
authored
Apr 07, 2011
by
antirez
Browse files
master node without slaves rejoin fixed
parent
152d937b
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
93666e58
...
@@ -919,8 +919,8 @@ void clusterCron(void) {
...
@@ -919,8 +919,8 @@ void clusterCron(void) {
int
delay
;
int
delay
;
if
(
node
->
flags
&
if
(
node
->
flags
&
(
REDIS_NODE_MYSELF
|
REDIS_NODE_NOADDR
|
REDIS_NODE_HANDSHAKE
|
(
REDIS_NODE_MYSELF
|
REDIS_NODE_NOADDR
|
REDIS_NODE_HANDSHAKE
))
REDIS_NODE_FAIL
))
continue
;
continue
;
/* Check only if we already sent a ping and did not received
/* Check only if we already sent a ping and did not received
* a reply yet. */
* a reply yet. */
if
(
node
->
ping_sent
==
0
||
if
(
node
->
ping_sent
==
0
||
...
@@ -945,7 +945,7 @@ void clusterCron(void) {
...
@@ -945,7 +945,7 @@ void clusterCron(void) {
}
else
{
}
else
{
/* Timeout reached. Set the noad se possibly failing if it is
/* Timeout reached. Set the noad se possibly failing if it is
* not already in this state. */
* not already in this state. */
if
(
!
(
node
->
flags
&
REDIS_NODE_PFAIL
))
{
if
(
!
(
node
->
flags
&
(
REDIS_NODE_PFAIL
|
REDIS_NODE_FAIL
)
))
{
redisLog
(
REDIS_DEBUG
,
"*** NODE %.40s possibly failing"
,
redisLog
(
REDIS_DEBUG
,
"*** NODE %.40s possibly failing"
,
node
->
name
);
node
->
name
);
node
->
flags
|=
REDIS_NODE_PFAIL
;
node
->
flags
|=
REDIS_NODE_PFAIL
;
...
...
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