etcdserver: remove TODO to delete URLStringsEqual
Discovery SRV supports to compare IP addresses with domain names, so we need URLStringsEqual function.release-2.2
parent
8ea3d157c5
commit
72462a72fb
|
@ -424,7 +424,6 @@ func ValidateClusterAndAssignIDs(local *cluster, existing *cluster) error {
|
||||||
sort.Sort(MembersByPeerURLs(lms))
|
sort.Sort(MembersByPeerURLs(lms))
|
||||||
|
|
||||||
for i := range ems {
|
for i := range ems {
|
||||||
// TODO: Remove URLStringsEqual after improvement of using hostnames #2150 #2123
|
|
||||||
if !netutil.URLStringsEqual(ems[i].PeerURLs, lms[i].PeerURLs) {
|
if !netutil.URLStringsEqual(ems[i].PeerURLs, lms[i].PeerURLs) {
|
||||||
return fmt.Errorf("unmatched member while checking PeerURLs")
|
return fmt.Errorf("unmatched member while checking PeerURLs")
|
||||||
}
|
}
|
||||||
|
|
|
@ -92,7 +92,6 @@ func (c *ServerConfig) verifyLocalMember(strict bool) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Advertised peer URLs must match those in the cluster peer list
|
// Advertised peer URLs must match those in the cluster peer list
|
||||||
// TODO: Remove URLStringsEqual after improvement of using hostnames #2150 #2123
|
|
||||||
apurls := c.PeerURLs.StringSlice()
|
apurls := c.PeerURLs.StringSlice()
|
||||||
sort.Strings(apurls)
|
sort.Strings(apurls)
|
||||||
urls.Sort()
|
urls.Sort()
|
||||||
|
|
Loading…
Reference in New Issue