vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pkg/netutil: fix false negative comparison 

Sort the resolved URLs before DeepEqual, so it will not compare URLs
that may be out of order due to resolution.
release-2.2
Yicheng Qin 2015-08-21 10:15:08 -07:00
parent 72462a72fb
commit b1192e5c48
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/netutil/netutil.go
View File

@ -20,9 +20,11 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"reflect" "reflect"
"sort"
"strings" "strings"
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog" "github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/pkg/capnslog"
"github.com/coreos/etcd/pkg/types"
) )
var ( var (
@ -67,15 +69,12 @@ func URLsEqual(a []url.URL, b []url.URL) bool {
if len(a) != len(b) { if len(a) != len(b) {
return false return false
} }
for i, urlA := range a { ResolveTCPAddrs(a, b)
urlB := b[i] sort.Sort(types.URLs(a))
sort.Sort(types.URLs(b))
if !reflect.DeepEqual(urlA, urlB) { for i := range a {
urls := []url.URL{urlA, urlB} if !reflect.DeepEqual(a[i], b[i]) {
ResolveTCPAddrs(urls) return false
if !reflect.DeepEqual(urls[0], urls[1]) {
return false
}
} }
} }

19
pkg/netutil/netutil_test.go
View File

@ -139,16 +139,21 @@ func TestResolveTCPAddrs(t *testing.T) {
func TestURLsEqual(t *testing.T) { func TestURLsEqual(t *testing.T) {
defer func() { resolveTCPAddr = net.ResolveTCPAddr }() defer func() { resolveTCPAddr = net.ResolveTCPAddr }()
hostm := map[string]string{
"example.com": "10.0.10.1",
"first.com": "10.0.11.1",
"second.com": "10.0.11.2",
}
resolveTCPAddr = func(network, addr string) (*net.TCPAddr, error) { resolveTCPAddr = func(network, addr string) (*net.TCPAddr, error) {
host, port, err := net.SplitHostPort(addr) host, port, err := net.SplitHostPort(addr)
if host != "example.com" { if _, ok := hostm[host]; !ok {
return nil, errors.New("cannot resolve host.") return nil, errors.New("cannot resolve host.")
} }
i, err := strconv.Atoi(port) i, err := strconv.Atoi(port)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &net.TCPAddr{IP: net.ParseIP("10.0.10.1"), Port: i, Zone: ""}, nil return &net.TCPAddr{IP: net.ParseIP(hostm[host]), Port: i, Zone: ""}, nil
} }
tests := []struct { tests := []struct {
@ -226,6 +231,16 @@ func TestURLsEqual(t *testing.T) {
b: []url.URL{{Scheme: "http", Host: "10.0.0.1:2379"}, {Scheme: "http", Host: "127.0.0.1:2380"}}, b: []url.URL{{Scheme: "http", Host: "10.0.0.1:2379"}, {Scheme: "http", Host: "127.0.0.1:2380"}},
expect: false, expect: false,
}, },
{
a: []url.URL{{Scheme: "http", Host: "first.com:2379"}, {Scheme: "http", Host: "second.com:2380"}},
b: []url.URL{{Scheme: "http", Host: "10.0.11.1:2379"}, {Scheme: "http", Host: "10.0.11.2:2380"}},
expect: true,
},
{
a: []url.URL{{Scheme: "http", Host: "second.com:2380"}, {Scheme: "http", Host: "first.com:2379"}},
b: []url.URL{{Scheme: "http", Host: "10.0.11.1:2379"}, {Scheme: "http", Host: "10.0.11.2:2380"}},
expect: true,
},
} }
for _, test := range tests { for _, test := range tests {