Merge pull request #7766 from gyuho/url
embed: use '*url.URL.Hostname(),Port()' for Go 1.8release-3.2
commit
30552e28ed
|
@ -387,7 +387,7 @@ func (cfg *Config) UpdateDefaultClusterFromName(defaultInitialCluster string) (s
|
||||||
}
|
}
|
||||||
|
|
||||||
used := false
|
used := false
|
||||||
pip, pport, _ := net.SplitHostPort(cfg.LPUrls[0].Host)
|
pip, pport := cfg.LPUrls[0].Hostname(), cfg.LPUrls[0].Port()
|
||||||
if cfg.defaultPeerHost() && pip == "0.0.0.0" {
|
if cfg.defaultPeerHost() && pip == "0.0.0.0" {
|
||||||
cfg.APUrls[0] = url.URL{Scheme: cfg.APUrls[0].Scheme, Host: fmt.Sprintf("%s:%s", defaultHostname, pport)}
|
cfg.APUrls[0] = url.URL{Scheme: cfg.APUrls[0].Scheme, Host: fmt.Sprintf("%s:%s", defaultHostname, pport)}
|
||||||
used = true
|
used = true
|
||||||
|
@ -397,7 +397,7 @@ func (cfg *Config) UpdateDefaultClusterFromName(defaultInitialCluster string) (s
|
||||||
cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name)
|
cfg.InitialCluster = cfg.InitialClusterFromName(cfg.Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
cip, cport, _ := net.SplitHostPort(cfg.LCUrls[0].Host)
|
cip, cport := cfg.LCUrls[0].Hostname(), cfg.LCUrls[0].Port()
|
||||||
if cfg.defaultClientHost() && cip == "0.0.0.0" {
|
if cfg.defaultClientHost() && cip == "0.0.0.0" {
|
||||||
cfg.ACUrls[0] = url.URL{Scheme: cfg.ACUrls[0].Scheme, Host: fmt.Sprintf("%s:%s", defaultHostname, cport)}
|
cfg.ACUrls[0] = url.URL{Scheme: cfg.ACUrls[0].Scheme, Host: fmt.Sprintf("%s:%s", defaultHostname, cport)}
|
||||||
used = true
|
used = true
|
||||||
|
|
|
@ -17,7 +17,6 @@ package embed
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net"
|
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"testing"
|
"testing"
|
||||||
|
@ -74,7 +73,7 @@ func TestUpdateDefaultClusterFromName(t *testing.T) {
|
||||||
origadvc := cfg.ACUrls[0].String()
|
origadvc := cfg.ACUrls[0].String()
|
||||||
|
|
||||||
cfg.Name = "abc"
|
cfg.Name = "abc"
|
||||||
_, lpport, _ := net.SplitHostPort(cfg.LPUrls[0].Host)
|
lpport := cfg.LPUrls[0].Port()
|
||||||
|
|
||||||
// in case of 'etcd --name=abc'
|
// in case of 'etcd --name=abc'
|
||||||
exp := fmt.Sprintf("%s=%s://localhost:%s", cfg.Name, oldscheme, lpport)
|
exp := fmt.Sprintf("%s=%s://localhost:%s", cfg.Name, oldscheme, lpport)
|
||||||
|
@ -105,13 +104,13 @@ func TestUpdateDefaultClusterFromNameOverwrite(t *testing.T) {
|
||||||
origadvc := cfg.ACUrls[0].String()
|
origadvc := cfg.ACUrls[0].String()
|
||||||
|
|
||||||
cfg.Name = "abc"
|
cfg.Name = "abc"
|
||||||
_, lpport, _ := net.SplitHostPort(cfg.LPUrls[0].Host)
|
lpport := cfg.LPUrls[0].Port()
|
||||||
cfg.LPUrls[0] = url.URL{Scheme: cfg.LPUrls[0].Scheme, Host: fmt.Sprintf("0.0.0.0:%s", lpport)}
|
cfg.LPUrls[0] = url.URL{Scheme: cfg.LPUrls[0].Scheme, Host: fmt.Sprintf("0.0.0.0:%s", lpport)}
|
||||||
dhost, _ := cfg.UpdateDefaultClusterFromName(defaultInitialCluster)
|
dhost, _ := cfg.UpdateDefaultClusterFromName(defaultInitialCluster)
|
||||||
if dhost != defaultHostname {
|
if dhost != defaultHostname {
|
||||||
t.Fatalf("expected default host %q, got %q", defaultHostname, dhost)
|
t.Fatalf("expected default host %q, got %q", defaultHostname, dhost)
|
||||||
}
|
}
|
||||||
aphost, apport, _ := net.SplitHostPort(cfg.APUrls[0].Host)
|
aphost, apport := cfg.APUrls[0].Hostname(), cfg.APUrls[0].Port()
|
||||||
if apport != lpport {
|
if apport != lpport {
|
||||||
t.Fatalf("advertise peer url got different port %s, expected %s", apport, lpport)
|
t.Fatalf("advertise peer url got different port %s, expected %s", apport, lpport)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue