Automated cherry pick of #13224 #14572 #14573
Merged
Conversation
This file contains 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
If one of the nodes in the cluster has lost a dns record, restarting the second node will break it. This PR makes an attempt to add a comparison without using a resolver, which allows to protect cluster from dns errors and does not break the current logic of comparing urls in the URLStringsEqual function. You can read more in the issue etcd-io#7798 Fixes etcd-io#7798 Signed-off-by: Prasad Chandrasekaran <prasadc@vmware.com>
Co-authored-by: Lili Cosic <cosiclili@gmail.com> Signed-off-by: Prasad Chandrasekaran <prasadc@vmware.com>
Signed-off-by: Prasad Chandrasekaran <prasadc@vmware.com>
ahrtr
reviewed
Oct 12, 2022
| for _, str := range us { | ||
| u, err := url.Parse(str) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to parse string to URL: %q", str) |
There was a problem hiding this comment.
It would be better to get the err included as well.
Suggested change
| return nil, fmt.Errorf("failed to parse string to URL: %q", str) | |
| return nil, fmt.Errorf("failed to parse string to URL: %q, %w", str, err) |
Since you are just backporting the PR, so please feel free to resolve this in a separate PR.
There was a problem hiding this comment.
I will create separate PR to fix this.
ahrtr
approved these changes
Oct 12, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cherry pick of #13224 on release-3.5.
#13224: netutil: add url comparison without resolver to