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
ae717310
Commit
ae717310
authored
Apr 11, 2013
by
antirez
Browse files
Cluster: PING/PONG handling redesigned.
parent
a120560f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/cluster.c
View file @
ae717310
...
...
@@ -888,7 +888,23 @@ int clusterProcessPacket(clusterLink *link) {
}
/* Update our info about the node */
if
(
link
->
node
)
link
->
node
->
pong_received
=
time
(
NULL
);
if (link->node && type == CLUSTERMSG_TYPE_PONG) {
link->node->pong_received = time(NULL);
link->node->ping_sent = 0;
/* The PFAIL condition can be reversed without external
* help if it is not transitive (that is, if it does not
* turn into a FAIL state).
*
* The FAIL condition is also reversible under specific
* conditions detected by clearNodeFailureIfNeeded(). */
if (link->node->flags & REDIS_NODE_PFAIL) {
link->node->flags &= ~REDIS_NODE_PFAIL;
update_state = 1;
} else if (link->node->flags & REDIS_NODE_FAIL) {
clearNodeFailureIfNeeded(link->node);
}
}
/* Update master/slave state */
if (sender) {
...
...
@@ -1502,8 +1518,8 @@ void clusterCron(void) {
dictIterator *di;
dictEntry *de;
int j, update_state = 0;
time_t
min_p
i
ng
_sent
=
0
;
clusterNode
*
min_p
i
ng_node
=
NULL
;
time_t min_p
o
ng = 0;
clusterNode *min_p
o
ng_node = NULL;
/* Check if we have disconnected nodes and re-establish the connection. */
di = dictGetIterator(server.cluster->nodes);
...
...
@@ -1522,7 +1538,10 @@ void clusterCron(void) {
link->fd = fd;
node->link = link;
aeCreateFileEvent(server.el,link->fd,AE_READABLE,clusterReadHandler,link);
/* If the node is flagged as MEET, we send a MEET message instead
/* Queue a PING in the new connection ASAP: this is crucial
* to avoid false positives in failure detection.
*
* If the node is flagged as MEET, we send a MEET message instead
* of a PING one, to force the receiver to add us in its node
* table. */
clusterSendPing(link, node->flags & REDIS_NODE_MEET ?
...
...
@@ -1540,21 +1559,22 @@ void clusterCron(void) {
dictReleaseIterator(di);
/* Ping some random node. Check a few random nodes and ping the one with
* the oldest p
i
ng_
sent
time */
* the oldest p
o
ng_
received
time */
for (j = 0; j < 5; j++) {
de = dictGetRandomKey(server.cluster->nodes);
clusterNode *this = dictGetVal(de);
if
(
this
->
link
==
NULL
)
continue
;
/* Don't ping nodes disconnected or with a ping currently active. */
if (this->link == NULL || this->ping_sent != 0) continue;
if (this->flags & (REDIS_NODE_MYSELF|REDIS_NODE_HANDSHAKE)) continue;
if
(
min_p
i
ng_node
==
NULL
||
min_p
i
ng
_sent
>
this
->
p
i
ng_
sent
)
{
min_p
i
ng_node
=
this
;
min_p
i
ng
_sent
=
this
->
p
i
ng_
sent
;
if (min_p
o
ng_node == NULL || min_p
o
ng > this->p
o
ng_
received
) {
min_p
o
ng_node = this;
min_p
o
ng = this->p
o
ng_
received
;
}
}
if
(
min_p
i
ng_node
)
{
redisLog
(
REDIS_DEBUG
,
"Pinging node %.40s"
,
min_p
i
ng_node
->
name
);
clusterSendPing
(
min_p
i
ng_node
->
link
,
CLUSTERMSG_TYPE_PING
);
if (min_p
o
ng_node) {
redisLog(REDIS_DEBUG,"Pinging node %.40s", min_p
o
ng_node->name);
clusterSendPing(min_p
o
ng_node->link, CLUSTERMSG_TYPE_PING);
}
/* Iterate nodes to check if we need to flag something as failing */
...
...
@@ -1568,42 +1588,43 @@ void clusterCron(void) {
(REDIS_NODE_MYSELF|REDIS_NODE_NOADDR|REDIS_NODE_HANDSHAKE))
continue;
/* If our ping is older than half the cluster timeout (may happen
* in a cluster with many nodes), send a new ping. */
#if 0
/* If we are waiting for the PONG more than half the cluster
* timeout, reconnect the link: maybe there is a connection
* issue even if the node is alive. */
if (node->link && /* is connected */
node->ping_sent && /* we already sent a ping */
node->pong_received < node->ping_sent && /* still waiting pong */
/* and we are waiting for the pong more than timeout/2 */
now - node->ping_sent > server.cluster_node_timeout/2)
{
/* Disconnect the link, it will be reconnected automatically. */
printf("DISCONNECT!\n");
freeClusterLink(node->link);
}
#endif
/* If we have currently no active ping in this instance, and the
* received PONG is older than half the cluster timeout, send
* a new ping now, to ensure all the nodes are pinged without
* a too big delay. */
if (node->link &&
(
now
-
node
->
ping_sent
)
>
server
.
cluster_node_timeout
/
2
)
node->ping_sent == 0 &&
(now - node->pong_received) > server.cluster_node_timeout/2)
{
clusterSendPing(node->link, CLUSTERMSG_TYPE_PING);
continue;
}
/* Check only if we already sent a ping and did not received
* a reply yet. */
if
(
node
->
ping_sent
==
0
||
node
->
ping_sent
<=
node
->
pong_received
)
continue
;
/* Check only if we have an active ping for this instance. */
if (node->ping_sent == 0) continue;
/* If we never received a pong, use the ping time to compute
* the delay. */
if
(
node
->
pong_received
)
{
delay
=
now
-
node
->
pong_received
;
}
else
{
delay
=
now
-
node
->
ping_sent
;
}
/* Compute the delay of the PONG. Note that if we already received
* the PONG, then node->ping_sent is zero, so can't reach this
* code at all. */
delay = now - node->ping_sent;
if
(
delay
<
server
.
cluster_node_timeout
)
{
/* The PFAIL condition can be reversed without external
* help if it is not transitive (that is, if it does not
* turn into a FAIL state).
*
* The FAIL condition is also reversible under specific
* conditions detected by clearNodeFailureIfNeeded(). */
if
(
node
->
flags
&
REDIS_NODE_PFAIL
)
{
node
->
flags
&=
~
REDIS_NODE_PFAIL
;
update_state
=
1
;
}
else
if
(
node
->
flags
&
REDIS_NODE_FAIL
)
{
clearNodeFailureIfNeeded
(
node
);
}
}
else
{
if (delay > server.cluster_node_timeout) {
/* Timeout reached. Set the node as possibly failing if it is
* not already in this state. */
if (!(node->flags & (REDIS_NODE_PFAIL|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