caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Invalid node address specified in redis-cli --cluster create/add-node (#11151)

Browse Source 
This bug was introduced in #10344 (7.0.3), and it breaks the
redis-cli --cluster create usage in #10436 (7.0 RC3).

At the same time, the cluster-port support introduced in #10344
cannot use the DNS lookup brought by #10436.
This commit is contained in:
Binbin 2022-09-19 18:59:36 +08:00 committed by GitHub
parent 13d25dd95e
commit c2b0c13d5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/redis-cli.c
View File

@ -6341,10 +6341,10 @@ assign_replicas:
* So if (bus_port == 0) or (bus_port == port + CLUSTER_MANAGER_PORT_INCR), * So if (bus_port == 0) or (bus_port == port + CLUSTER_MANAGER_PORT_INCR),
* we just call CLUSTER MEET with 2 arguments, using the old form. */ * we just call CLUSTER MEET with 2 arguments, using the old form. */
reply = CLUSTER_MANAGER_COMMAND(node, "cluster meet %s %d", reply = CLUSTER_MANAGER_COMMAND(node, "cluster meet %s %d",
first->ip, first->port); first_ip, first->port);
} else { } else {
reply = CLUSTER_MANAGER_COMMAND(node, "cluster meet %s %d %d", reply = CLUSTER_MANAGER_COMMAND(node, "cluster meet %s %d %d",
first->ip, first->port, first->bus_port); first_ip, first->port, first->bus_port);
} }
int is_err = 0; int is_err = 0;
if (reply != NULL) { if (reply != NULL) {
@ -6535,7 +6535,7 @@ static int clusterManagerCommandAddNode(int argc, char **argv) {
first_ip, first->port); first_ip, first->port);
} else { } else {
reply = CLUSTER_MANAGER_COMMAND(new_node, "CLUSTER MEET %s %d %d", reply = CLUSTER_MANAGER_COMMAND(new_node, "CLUSTER MEET %s %d %d",
first->ip, first->port, first->bus_port); first_ip, first->port, first->bus_port);
} }
if (!(success = clusterManagerCheckRedisReply(new_node, reply, NULL))) if (!(success = clusterManagerCheckRedisReply(new_node, reply, NULL)))