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

Fully resolve DNS entries to IPs and ignore single errors (such as no etcd-server-ssl)

Browse Source
This commit is contained in:
Barak Michener 2014-12-18 18:08:56 -05:00
parent fc70aa27d2
commit 7f733ad68b
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etcdmain/etcd.go
View File

@ -459,9 +459,15 @@ func genDNSClusterString(defaultToken string, apurls types.URLs) (string, string
return err
}
for _, srv := range addrs {
host := net.JoinHostPort(srv.Target, fmt.Sprintf("%d", srv.Port))
tcpAddr, err := net.ResolveTCPAddr("tcp", host)
if err != nil {
log.Printf("etcd: Couldn't resolve host %s", host)
continue
}
n := ""
for _, url := range apurls {
if url.Host == fmt.Sprintf("%s:%d", srv.Target, srv.Port) {
if url.Host == tcpAddr.String() {
n = *name
}
}
@ -469,18 +475,25 @@ func genDNSClusterString(defaultToken string, apurls types.URLs) (string, string
n = fmt.Sprintf("%d", tempName)
tempName += 1
}
stringParts = append(stringParts, fmt.Sprintf("%s=%s%s:%d", n, prefix, srv.Target, srv.Port))
log.Printf("etcd: Got bootstrap from DNS for %s at %s%s:%d", service, prefix, srv.Target, srv.Port)
stringParts = append(stringParts, fmt.Sprintf("%s=%s%s", n, prefix, tcpAddr.String()))
log.Printf("etcd: Got bootstrap from DNS for %s at host %s to %s%s", service, host, prefix, tcpAddr.String())
}
return nil
}
failCount := 0
err := updateNodeMap("etcd-server-ssl", "https://")
if err != nil {
return "", "", err
log.Printf("etcd: Error querying DNS SRV records for _etcd-server-ssl. Error: %s.", err)
failCount += 1
}
err = updateNodeMap("etcd-server", "http://")
if err != nil {
log.Printf("etcd: Error querying DNS SRV records for _etcd-server. Error: %s.", err)
failCount += 1
}
if failCount == 2 {
log.Printf("etcd: Too many errors querying DNS SRV records. Failing discovery.")
return "", "", err
}
return strings.Join(stringParts, ","), defaultToken, nil