For MEETs, save the extensions support flag immediately during MEET processing (#778)
For backwards compatibility reasons, a node will wait until it receives a cluster message with the extensions flag before sending its own extensions. This leads to a delay in shard ID propagation that can corrupt nodes.conf with inaccurate shard IDs if a node is restarted before this can stabilize. This fixes much of that delay by immediately triggering the extensions-supported flag during the MEET processing and attaching the node to the link, allowing the PONG reply to contain OSS extensions. Partially fixes #774 --------- Signed-off-by: Ben Totten <btotten@amazon.com> Co-authored-by: Ben Totten <btotten@amazon.com>
This commit is contained in:
parent
50c1fe59f7
commit
affbea5dc1
@ -3156,7 +3156,10 @@ int clusterProcessPacket(clusterLink *link) {
|
||||
/* Add this node if it is new for us and the msg type is MEET.
|
||||
* In this stage we don't try to add the node with the right
|
||||
* flags, replicaof pointer, and so forth, as this details will be
|
||||
* resolved when we'll receive PONGs from the node. */
|
||||
* resolved when we'll receive PONGs from the node. The exception
|
||||
* to this is the flag that indicates extensions are supported, as
|
||||
* we want to send extensions right away in the return PONG in order
|
||||
* to reduce the amount of time needed to stabilize the shard ID. */
|
||||
if (!sender && type == CLUSTERMSG_TYPE_MEET) {
|
||||
clusterNode *node;
|
||||
|
||||
@ -3164,6 +3167,10 @@ int clusterProcessPacket(clusterLink *link) {
|
||||
serverAssert(nodeIp2String(node->ip, link, hdr->myip) == C_OK);
|
||||
getClientPortFromClusterMsg(hdr, &node->tls_port, &node->tcp_port);
|
||||
node->cport = ntohs(hdr->cport);
|
||||
if (hdr->mflags[0] & CLUSTERMSG_FLAG0_EXT_DATA) {
|
||||
node->flags |= CLUSTER_NODE_EXTENSIONS_SUPPORTED;
|
||||
}
|
||||
setClusterNodeToInboundClusterLink(node, link);
|
||||
clusterAddNode(node);
|
||||
clusterDoBeforeSleep(CLUSTER_TODO_SAVE_CONFIG);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user