Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcdserver: remove TODO to delete URLStringsEqual

Browse Source 
Discovery SRV supports to compare IP addresses with domain names,
so we need URLStringsEqual function.
This commit is contained in:
Yicheng Qin 2015-08-21 09:51:07 -07:00
parent bbefb0ad0b
commit 89640cf08f
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etcdserver/cluster.go
View File

@ -421,7 +421,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")
} }

1
etcdserver/config.go
View File

@ -89,7 +89,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()