master node without slaves rejoin fixed

This commit is contained in:
antirez 2011-04-07 23:10:32 +02:00
parent 152d937b8c
commit 93666e583c

View File

@ -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) {
} 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;