[Redis-benchmark] Use IPs in the reply of CLUSTER NODES command#8154
Merged
oranagra merged 1 commit intoredis:unstablefrom Dec 17, 2020
Merged
[Redis-benchmark] Use IPs in the reply of CLUSTER NODES command#8154oranagra merged 1 commit intoredis:unstablefrom
oranagra merged 1 commit intoredis:unstablefrom
Conversation
oranagra
reviewed
Dec 16, 2020
Comment on lines
+1185
to
+1186
| if (ip != NULL && strcmp(node->ip, ip) != 0) { | ||
| node->ip = sdsnew(ip); |
Member
There was a problem hiding this comment.
@ShooterIT i'm not too familiar with this area, but noticed this PR was neglected and and i would like to promote, please help me with the review.
one thing that's odd to me is that in the past we used to enter this block only if node->ip is NULL, and now we proceed to do strcmp without even checking if if's NULL or not. so maybe we need another || here.
another thing i wanna note is that we need to aim for redis-benchmark to be able to work with both new and old redis servers, so it should still be compatible with the old behavior of CLUSTER NODES too.
Member
Author
There was a problem hiding this comment.
oranagra
approved these changes
Dec 17, 2020
linxiang-dev
pushed a commit
to linxiang-dev/redis
that referenced
this pull request
Dec 27, 2020
…edis#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.
oranagra
added
the
release-notes
Merged
JackieXie168
pushed a commit
to JackieXie168/redis
that referenced
this pull request
Mar 2, 2021
…edis#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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.
But now, more than one node in cluster, if we use
-hwith 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.We must use
sdsnew(ip)to updatenode->ipif it is different from config.hostip, because we will freeipwhen leave this function.Here will free
node->iphttps://github.com/redis/redis/blob/unstable/src/redis-benchmark.c#L1084-L1088