Skip to content

Check for duplicate nodeids when loading nodes.conf #2852

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

Open
wants to merge 2 commits into
base: unstable
Choose a base branch
from
+16 −0
Open

Check for duplicate nodeids when loading nodes.conf #2852

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfa8d6b
Check for duplicate nodeids when loading nodes.conf
enjoy-binbin Nov 17, 2025
96159e0
more code
enjoy-binbin Nov 17, 2025
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
16 changes: 16 additions & 0 deletions src/cluster_legacy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,7 @@ int clusterLoadConfig(char *filename) {
struct stat sb;
char *line;
int maxline, j;
dict *tmp_cluster_nodes;

if (fp == NULL) {
if (errno == ENOENT) {
Expand Down Expand Up @@ -637,6 +638,7 @@ int clusterLoadConfig(char *filename) {
* To simplify we allocate 1024+CLUSTER_SLOTS*128 bytes per line. */
maxline = 1024 + CLUSTER_SLOTS * 128;
line = zmalloc(maxline);
tmp_cluster_nodes = dictCreate(&clusterNodesDictType);
while (fgets(line, maxline, fp) != NULL) {
int argc, aux_argc;
sds *argv, *aux_argv;
Expand Down Expand Up @@ -684,6 +686,19 @@ int clusterLoadConfig(char *filename) {
if (!n) {
n = createClusterNode(argv[0], 0);
clusterAddNode(n);
dictAdd(tmp_cluster_nodes, sdsnewlen(argv[0], sdslen(argv[0])), NULL);
} else {
/* Check if the node (nodeid) has already been loaded. The nodeid is used to
* identify every node across the entire cluster, we do not expect to find
* duplicate nodeids in nodes.conf. */
sds nodename = sdsnewlen(argv[0], sdslen(argv[0]));
Copy link
Contributor

@sarthakaggarwal97 sarthakaggarwal97 Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to create a new sds for dictfind?

dictEntry *de = dictFind(tmp_cluster_nodes, nodename);
sdsfree(nodename);
if (de != NULL) {
serverLog(LL_WARNING, "Duplicate nodeid detected: %s", argv[0]);
sdsfreesplitres(argv, argc);
goto fmterr;
}
}
/* Format for the node address and auxiliary argument information:
* ip:port[@cport][,hostname][,aux=val]*] */
Expand Down Expand Up @@ -940,6 +955,7 @@ int clusterLoadConfig(char *filename) {

zfree(line);
fclose(fp);
if (tmp_cluster_nodes) dictRelease(tmp_cluster_nodes);
Copy link
Member

@JimB123 JimB123 Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tmp_cluster_nodes is always non-null at this point, right?

Copy link
Member Author

@enjoy-binbin enjoy-binbin Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, you are right. I will remove it later.

Copy link
Member

@roshkhatri roshkhatri Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add a serverAssert (tmp_cluster_nodes!= NULL) before this


serverLog(LL_NOTICE, "Node configuration loaded, I'm %.40s", myself->name);

Expand Down
Loading