Explorar el Código

etcdserver: remove TODO to delete URLStringsEqual

Discovery SRV supports to compare IP addresses with domain names,
so we need URLStringsEqual function.
Yicheng Qin hace 11 años
padre
commit
72462a72fb
Se han modificado 2 ficheros con 0 adiciones y 2 borrados
  1. 0 1
      etcdserver/cluster.go
  2. 0 1
      etcdserver/config.go

+ 0 - 1
etcdserver/cluster.go

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

+ 0 - 1
etcdserver/config.go

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