From 89640cf08f2023397cb609add22358be96c2d4d8 Mon Sep 17 00:00:00 2001 From: Yicheng Qin Date: Fri, 21 Aug 2015 09:51:07 -0700 Subject: [PATCH] etcdserver: remove TODO to delete URLStringsEqual Discovery SRV supports to compare IP addresses with domain names, so we need URLStringsEqual function. --- etcdserver/cluster.go | 1 - etcdserver/config.go | 1 - 2 files changed, 2 deletions(-) diff --git a/etcdserver/cluster.go b/etcdserver/cluster.go index 662ae099a..db2c7257d 100644 --- a/etcdserver/cluster.go +++ b/etcdserver/cluster.go @@ -421,7 +421,6 @@ func ValidateClusterAndAssignIDs(local *cluster, existing *cluster) error { sort.Sort(MembersByPeerURLs(lms)) for i := range ems { - // TODO: Remove URLStringsEqual after improvement of using hostnames #2150 #2123 if !netutil.URLStringsEqual(ems[i].PeerURLs, lms[i].PeerURLs) { return fmt.Errorf("unmatched member while checking PeerURLs") } diff --git a/etcdserver/config.go b/etcdserver/config.go index ca6d9c899..4002af179 100644 --- a/etcdserver/config.go +++ b/etcdserver/config.go @@ -89,7 +89,6 @@ func (c *ServerConfig) verifyLocalMember(strict bool) error { } // 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() sort.Strings(apurls) urls.Sort()