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: add error details on DNS resolution failure on advertise URLs

Browse Source 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-01-23 15:30:31 -08:00
parent 7dd9c30ae7
commit 2b10bcccee
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etcdserver/config.go
View File

@ -124,7 +124,8 @@ func (c *ServerConfig) advertiseMatchesCluster() error {
sort.Strings(apurls) sort.Strings(apurls)
ctx, cancel := context.WithTimeout(context.TODO(), 30*time.Second) ctx, cancel := context.WithTimeout(context.TODO(), 30*time.Second)
defer cancel() defer cancel()
if netutil.URLStringsEqual(ctx, apurls, urls.StringSlice()) { ok, err := netutil.URLStringsEqual(ctx, apurls, urls.StringSlice())
if ok {
return nil return nil
} }
@ -148,7 +149,7 @@ func (c *ServerConfig) advertiseMatchesCluster() error {
} }
mstr := strings.Join(missing, ",") mstr := strings.Join(missing, ",")
apStr := strings.Join(apurls, ",") apStr := strings.Join(apurls, ",")
return fmt.Errorf("--initial-cluster has %s but missing from --initial-advertise-peer-urls=%s ", mstr, apStr) return fmt.Errorf("--initial-cluster has %s but missing from --initial-advertise-peer-urls=%s (%v)", mstr, apStr, err)
} }
for url := range apMap { for url := range apMap {
@ -156,9 +157,16 @@ func (c *ServerConfig) advertiseMatchesCluster() error {
missing = append(missing, url) missing = append(missing, url)
} }
} }
if len(missing) > 0 {
mstr := strings.Join(missing, ",") mstr := strings.Join(missing, ",")
umap := types.URLsMap(map[string]types.URLs{c.Name: c.PeerURLs}) umap := types.URLsMap(map[string]types.URLs{c.Name: c.PeerURLs})
return fmt.Errorf("--initial-advertise-peer-urls has %s but missing from --initial-cluster=%s", mstr, umap.String()) return fmt.Errorf("--initial-advertise-peer-urls has %s but missing from --initial-cluster=%s", mstr, umap.String())
}
// resolved URLs from "--initial-advertise-peer-urls" and "--initial-cluster" did not match or failed
apStr := strings.Join(apurls, ",")
umap := types.URLsMap(map[string]types.URLs{c.Name: c.PeerURLs})
return fmt.Errorf("failed to resolve %s to match --initial-cluster=%s (%v)", apStr, umap.String(), err)
} }
func (c *ServerConfig) MemberDir() string { return filepath.Join(c.DataDir, "member") } func (c *ServerConfig) MemberDir() string { return filepath.Join(c.DataDir, "member") }