Skip to content

Raft Cluster: fix CLUSTER SHARDS visibility and replica health reporting #3910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zuiderkwast merged 2 commits into from
Jun 4, 2026
Merged

Raft Cluster: fix CLUSTER SHARDS visibility and replica health reporting #3910

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc4842b
Raft: add nodes to shards dict on NODE_JOIN apply
zuiderkwast Jun 3, 2026
d75a8fc
Raft: fix REPL_OFFSETS broadcast for replica health tracking
zuiderkwast Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/cluster_raft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ static clusterMsgSendBlock *clusterRaftBuildAllOffsetsMsg(void) {
if (n->flags & CLUSTER_NODE_MEET) continue;
long long off = (n == myself) ? getNodeReplicationOffset(myself)
: n->repl_offset;
if (off == 0) continue;
msg = sdscatlen(msg, " ", 1);
msg = sdscatlen(msg, n->name, CLUSTER_NAMELEN);
msg = sdscatfmt(msg, " %I", off);
Expand Down Expand Up @@ -928,13 +927,15 @@ static void raftLogApply(raftLogEntry *e) {
/* Update address for existing node. */
clusterNodeParseAddressString(existing, argv[1]);
}
/* Only count the first NODE_JOIN for each node. New nodes
* don't have HANDSHAKE. Existing nodes from handshake do. */
/* Increment size on first official join. Nodes created from MEET
* handshake have CLUSTER_NODE_MEET set; clear it now. Nodes created
* fresh (on followers) don't exist yet. Either way, count once. */
clusterNode *joined = existing ? existing : clusterLookupNode(argv[0], CLUSTER_NAMELEN);
if (joined) {
if (!existing || (joined->flags & CLUSTER_NODE_MEET)) {
joined->flags &= ~CLUSTER_NODE_MEET;
server.cluster->size++;
clusterAddNodeToShard(joined->shard_id, joined);

/* Process deferred MEET messages now that we're in a cluster. */
if (server.cluster->size > 1 && listLength(rs->deferred_meets) > 0) {
Expand Down Expand Up @@ -1309,8 +1310,10 @@ static int clusterRaftProcessAppendEntriesResponse(clusterLink *link, int argc,
node->repl_offset = follower_repl_offset;

/* Broadcast this node's offset to all peers when it transitions
* from 0 to non-zero (e.g. replica finishes initial sync). */
if (prev_offset == 0 && follower_repl_offset > 0 && !(node->flags & CLUSTER_NODE_MEET)) {
* between 0 and non-zero (replica finishes sync or starts resync). */
if (prev_offset != follower_repl_offset &&
(prev_offset == 0 || follower_repl_offset == 0) &&
!(node->flags & CLUSTER_NODE_MEET)) {
Comment thread
coderabbitai[bot] marked this conversation as resolved.
clusterRaftBroadcastNodeOffset(node, follower_repl_offset);
}

Expand Down Expand Up @@ -1518,6 +1521,7 @@ static void clusterRaftInit(void) {
rs->deferred_meets = listCreate();
rs->my_last_committed_info = sdsempty();
rs->last_node_info_check = monotonicMs();
rs->last_repl_offsets_broadcast = monotonicMs();
server.cluster->size = 0; /* Incremented by NODE_JOIN apply */
}

Expand Down
Loading