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

discovery: warn on scheme mismatch

Browse Source
This commit is contained in:
Anthony Romano 2016-11-18 12:47:21 -08:00
parent 377f19b003
commit 74ae67b835
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
discovery/srv.go
View File

@ -17,6 +17,7 @@ package discovery
import ( import (
"fmt" "fmt"
"net" "net"
"net/url"
"strings" "strings"
"github.com/coreos/etcd/pkg/types" "github.com/coreos/etcd/pkg/types"
@ -33,11 +34,8 @@ var (
// Also doesn't do any lookups for the token (though it could) // Also doesn't do any lookups for the token (though it could)
// Also sees each entry as a separate instance. // Also sees each entry as a separate instance.
func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (string, string, error) { func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (string, string, error) {
var (
stringParts []string
tcpAPUrls []string
)
tempName := int(0) tempName := int(0)
tcp2ap := make(map[string]url.URL)
// First, resolve the apurls // First, resolve the apurls
for _, url := range apurls { for _, url := range apurls {
@ -46,10 +44,11 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st
plog.Errorf("couldn't resolve host %s during SRV discovery", url.Host) plog.Errorf("couldn't resolve host %s during SRV discovery", url.Host)
return "", "", err return "", "", err
} }
tcpAPUrls = append(tcpAPUrls, tcpAddr.String()) tcp2ap[tcpAddr.String()] = url
} }
updateNodeMap := func(service, prefix string) error { stringParts := []string{}
updateNodeMap := func(service, scheme string) error {
_, addrs, err := lookupSRV(service, "tcp", dns) _, addrs, err := lookupSRV(service, "tcp", dns)
if err != nil { if err != nil {
return err return err
@ -63,10 +62,9 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st
continue continue
} }
n := "" n := ""
for _, url := range tcpAPUrls { url, ok := tcp2ap[tcpAddr.String()]
if url == tcpAddr.String() { if ok {
n = name n = name
}
} }
if n == "" { if n == "" {
n = fmt.Sprintf("%d", tempName) n = fmt.Sprintf("%d", tempName)
@ -75,20 +73,23 @@ func SRVGetCluster(name, dns string, defaultToken string, apurls types.URLs) (st
// SRV records have a trailing dot but URL shouldn't. // SRV records have a trailing dot but URL shouldn't.
shortHost := strings.TrimSuffix(srv.Target, ".") shortHost := strings.TrimSuffix(srv.Target, ".")
urlHost := net.JoinHostPort(shortHost, port) urlHost := net.JoinHostPort(shortHost, port)
stringParts = append(stringParts, fmt.Sprintf("%s=%s%s", n, prefix, urlHost)) stringParts = append(stringParts, fmt.Sprintf("%s=%s://%s", n, scheme, urlHost))
plog.Noticef("got bootstrap from DNS for %s at %s%s", service, prefix, urlHost) plog.Noticef("got bootstrap from DNS for %s at %s%s", service, scheme, urlHost)
if ok && url.Scheme != scheme {
plog.Errorf("bootstrap at %s from DNS for %s has scheme mismatch with expected peer %s", scheme+"://"+urlHost, service, url.String())
}
} }
return nil return nil
} }
failCount := 0 failCount := 0
err := updateNodeMap("etcd-server-ssl", "https://") err := updateNodeMap("etcd-server-ssl", "https")
srvErr := make([]string, 2) srvErr := make([]string, 2)
if err != nil { if err != nil {
srvErr[0] = fmt.Sprintf("error querying DNS SRV records for _etcd-server-ssl %s", err) srvErr[0] = fmt.Sprintf("error querying DNS SRV records for _etcd-server-ssl %s", err)
failCount++ failCount++
} }
err = updateNodeMap("etcd-server", "http://") err = updateNodeMap("etcd-server", "http")
if err != nil { if err != nil {
srvErr[1] = fmt.Sprintf("error querying DNS SRV records for _etcd-server %s", err) srvErr[1] = fmt.Sprintf("error querying DNS SRV records for _etcd-server %s", err)
failCount++ failCount++