From b9f236a7812a29746a39c552e330608c2d4f527e Mon Sep 17 00:00:00 2001 From: Wang Yuan Date: Thu, 17 Dec 2020 16:22:13 +0800 Subject: [PATCH] [Redis-benchmark] Use IP from CLUSTER NODE reply for first node too (#8154) If we only has one node in cluster or before 8fdc857, we don't know myself ip, so we should use config.hostip for myself. However, we should use the IP from the command response to update node->ip if it exists and is different from config.hostip otherwise, when there's more than one node in cluster, if we use -h with virtual IP or DNS, benchmark doesn't show node real ip and port of myself even though it could get right IP and port by CLUSTER NODES command. --- src/redis-benchmark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c index 4efed4b12..18e19b0e0 100644 --- a/src/redis-benchmark.c +++ b/src/redis-benchmark.c @@ -1182,8 +1182,8 @@ static int fetchClusterConfiguration() { } if (myself) { node = firstNode; - if (node->ip == NULL && ip != NULL) { - node->ip = ip; + if (ip != NULL && strcmp(node->ip, ip) != 0) { + node->ip = sdsnew(ip); node->port = port; } } else {