commit
b87243d827
|
@ -31,13 +31,13 @@ import (
|
||||||
func TestClusterFromString(t *testing.T) {
|
func TestClusterFromString(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
f string
|
f string
|
||||||
mems []Member
|
mems []*Member
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
"mem1=http://10.0.0.1:2379,mem1=http://128.193.4.20:2379,mem2=http://10.0.0.2:2379,default=http://127.0.0.1:2379",
|
"mem1=http://10.0.0.1:2379,mem1=http://128.193.4.20:2379,mem2=http://10.0.0.2:2379,default=http://127.0.0.1:2379",
|
||||||
[]Member{
|
[]*Member{
|
||||||
newTestMember(4322322643958477905, []string{"http://10.0.0.1:2379", "http://128.193.4.20:2379"}, "mem1", nil),
|
|
||||||
newTestMember(3141198903430435750, []string{"http://10.0.0.2:2379"}, "mem2", nil),
|
newTestMember(3141198903430435750, []string{"http://10.0.0.2:2379"}, "mem2", nil),
|
||||||
|
newTestMember(4322322643958477905, []string{"http://10.0.0.1:2379", "http://128.193.4.20:2379"}, "mem1", nil),
|
||||||
newTestMember(12762790032478827328, []string{"http://127.0.0.1:2379"}, "default", nil),
|
newTestMember(12762790032478827328, []string{"http://127.0.0.1:2379"}, "default", nil),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -50,9 +50,8 @@ func TestClusterFromString(t *testing.T) {
|
||||||
if c.token != "abc" {
|
if c.token != "abc" {
|
||||||
t.Errorf("#%d: token = %v, want abc", i, c.token)
|
t.Errorf("#%d: token = %v, want abc", i, c.token)
|
||||||
}
|
}
|
||||||
wc := newTestCluster(tt.mems)
|
if !reflect.DeepEqual(c.Members(), tt.mems) {
|
||||||
if !reflect.DeepEqual(c.members, wc.members) {
|
t.Errorf("#%d: members = %+v, want %+v", i, c.Members(), tt.mems)
|
||||||
t.Errorf("#%d: members = %+v, want %+v", i, c.members, wc.members)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -80,16 +79,16 @@ func TestClusterFromStringBad(t *testing.T) {
|
||||||
|
|
||||||
func TestClusterFromStore(t *testing.T) {
|
func TestClusterFromStore(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
mems []Member
|
mems []*Member
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
[]Member{newTestMember(1, nil, "node1", nil)},
|
[]*Member{newTestMember(1, nil, "node1", nil)},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
[]Member{},
|
nil,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
[]Member{
|
[]*Member{
|
||||||
newTestMember(1, nil, "node1", nil),
|
newTestMember(1, nil, "node1", nil),
|
||||||
newTestMember(2, nil, "node2", nil),
|
newTestMember(2, nil, "node2", nil),
|
||||||
},
|
},
|
||||||
|
@ -98,21 +97,20 @@ func TestClusterFromStore(t *testing.T) {
|
||||||
for i, tt := range tests {
|
for i, tt := range tests {
|
||||||
hc := newTestCluster(nil)
|
hc := newTestCluster(nil)
|
||||||
for _, m := range tt.mems {
|
for _, m := range tt.mems {
|
||||||
hc.AddMember(&m)
|
hc.AddMember(m)
|
||||||
}
|
}
|
||||||
c := NewClusterFromStore("abc", hc.store)
|
c := NewClusterFromStore("abc", hc.store)
|
||||||
if c.token != "abc" {
|
if c.token != "abc" {
|
||||||
t.Errorf("#%d: token = %v, want %v", i, c.token, "abc")
|
t.Errorf("#%d: token = %v, want %v", i, c.token, "abc")
|
||||||
}
|
}
|
||||||
wc := newTestCluster(tt.mems)
|
if !reflect.DeepEqual(c.Members(), tt.mems) {
|
||||||
if !reflect.DeepEqual(c.members, wc.members) {
|
t.Errorf("#%d: members = %v, want %v", i, c.Members(), tt.mems)
|
||||||
t.Errorf("#%d: members = %v, want %v", i, c.members, wc.members)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestClusterMember(t *testing.T) {
|
func TestClusterMember(t *testing.T) {
|
||||||
membs := []Member{
|
membs := []*Member{
|
||||||
newTestMember(1, nil, "node1", nil),
|
newTestMember(1, nil, "node1", nil),
|
||||||
newTestMember(2, nil, "node2", nil),
|
newTestMember(2, nil, "node2", nil),
|
||||||
}
|
}
|
||||||
|
@ -137,7 +135,7 @@ func TestClusterMember(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestClusterMemberByName(t *testing.T) {
|
func TestClusterMemberByName(t *testing.T) {
|
||||||
membs := []Member{
|
membs := []*Member{
|
||||||
newTestMember(1, nil, "node1", nil),
|
newTestMember(1, nil, "node1", nil),
|
||||||
newTestMember(2, nil, "node2", nil),
|
newTestMember(2, nil, "node2", nil),
|
||||||
}
|
}
|
||||||
|
@ -162,7 +160,7 @@ func TestClusterMemberByName(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestClusterMemberIDs(t *testing.T) {
|
func TestClusterMemberIDs(t *testing.T) {
|
||||||
c := newTestCluster([]Member{
|
c := newTestCluster([]*Member{
|
||||||
newTestMember(1, nil, "", nil),
|
newTestMember(1, nil, "", nil),
|
||||||
newTestMember(4, nil, "", nil),
|
newTestMember(4, nil, "", nil),
|
||||||
newTestMember(100, nil, "", nil),
|
newTestMember(100, nil, "", nil),
|
||||||
|
@ -176,12 +174,12 @@ func TestClusterMemberIDs(t *testing.T) {
|
||||||
|
|
||||||
func TestClusterPeerURLs(t *testing.T) {
|
func TestClusterPeerURLs(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
mems []Member
|
mems []*Member
|
||||||
wurls []string
|
wurls []string
|
||||||
}{
|
}{
|
||||||
// single peer with a single address
|
// single peer with a single address
|
||||||
{
|
{
|
||||||
mems: []Member{
|
mems: []*Member{
|
||||||
newTestMember(1, []string{"http://192.0.2.1"}, "", nil),
|
newTestMember(1, []string{"http://192.0.2.1"}, "", nil),
|
||||||
},
|
},
|
||||||
wurls: []string{"http://192.0.2.1"},
|
wurls: []string{"http://192.0.2.1"},
|
||||||
|
@ -189,7 +187,7 @@ func TestClusterPeerURLs(t *testing.T) {
|
||||||
|
|
||||||
// single peer with a single address with a port
|
// single peer with a single address with a port
|
||||||
{
|
{
|
||||||
mems: []Member{
|
mems: []*Member{
|
||||||
newTestMember(1, []string{"http://192.0.2.1:8001"}, "", nil),
|
newTestMember(1, []string{"http://192.0.2.1:8001"}, "", nil),
|
||||||
},
|
},
|
||||||
wurls: []string{"http://192.0.2.1:8001"},
|
wurls: []string{"http://192.0.2.1:8001"},
|
||||||
|
@ -197,7 +195,7 @@ func TestClusterPeerURLs(t *testing.T) {
|
||||||
|
|
||||||
// several members explicitly unsorted
|
// several members explicitly unsorted
|
||||||
{
|
{
|
||||||
mems: []Member{
|
mems: []*Member{
|
||||||
newTestMember(2, []string{"http://192.0.2.3", "http://192.0.2.4"}, "", nil),
|
newTestMember(2, []string{"http://192.0.2.3", "http://192.0.2.4"}, "", nil),
|
||||||
newTestMember(3, []string{"http://192.0.2.5", "http://192.0.2.6"}, "", nil),
|
newTestMember(3, []string{"http://192.0.2.5", "http://192.0.2.6"}, "", nil),
|
||||||
newTestMember(1, []string{"http://192.0.2.1", "http://192.0.2.2"}, "", nil),
|
newTestMember(1, []string{"http://192.0.2.1", "http://192.0.2.2"}, "", nil),
|
||||||
|
@ -207,13 +205,13 @@ func TestClusterPeerURLs(t *testing.T) {
|
||||||
|
|
||||||
// no members
|
// no members
|
||||||
{
|
{
|
||||||
mems: []Member{},
|
mems: []*Member{},
|
||||||
wurls: []string{},
|
wurls: []string{},
|
||||||
},
|
},
|
||||||
|
|
||||||
// peer with no peer urls
|
// peer with no peer urls
|
||||||
{
|
{
|
||||||
mems: []Member{
|
mems: []*Member{
|
||||||
newTestMember(3, []string{}, "", nil),
|
newTestMember(3, []string{}, "", nil),
|
||||||
},
|
},
|
||||||
wurls: []string{},
|
wurls: []string{},
|
||||||
|
@ -231,12 +229,12 @@ func TestClusterPeerURLs(t *testing.T) {
|
||||||
|
|
||||||
func TestClusterClientURLs(t *testing.T) {
|
func TestClusterClientURLs(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
mems []Member
|
mems []*Member
|
||||||
wurls []string
|
wurls []string
|
||||||
}{
|
}{
|
||||||
// single peer with a single address
|
// single peer with a single address
|
||||||
{
|
{
|
||||||
mems: []Member{
|
mems: []*Member{
|
||||||
newTestMember(1, nil, "", []string{"http://192.0.2.1"}),
|
newTestMember(1, nil, "", []string{"http://192.0.2.1"}),
|
||||||
},
|
},
|
||||||
wurls: []string{"http://192.0.2.1"},
|
wurls: []string{"http://192.0.2.1"},
|
||||||
|
@ -244,7 +242,7 @@ func TestClusterClientURLs(t *testing.T) {
|
||||||
|
|
||||||
// single peer with a single address with a port
|
// single peer with a single address with a port
|
||||||
{
|
{
|
||||||
mems: []Member{
|
mems: []*Member{
|
||||||
newTestMember(1, nil, "", []string{"http://192.0.2.1:8001"}),
|
newTestMember(1, nil, "", []string{"http://192.0.2.1:8001"}),
|
||||||
},
|
},
|
||||||
wurls: []string{"http://192.0.2.1:8001"},
|
wurls: []string{"http://192.0.2.1:8001"},
|
||||||
|
@ -252,7 +250,7 @@ func TestClusterClientURLs(t *testing.T) {
|
||||||
|
|
||||||
// several members explicitly unsorted
|
// several members explicitly unsorted
|
||||||
{
|
{
|
||||||
mems: []Member{
|
mems: []*Member{
|
||||||
newTestMember(2, nil, "", []string{"http://192.0.2.3", "http://192.0.2.4"}),
|
newTestMember(2, nil, "", []string{"http://192.0.2.3", "http://192.0.2.4"}),
|
||||||
newTestMember(3, nil, "", []string{"http://192.0.2.5", "http://192.0.2.6"}),
|
newTestMember(3, nil, "", []string{"http://192.0.2.5", "http://192.0.2.6"}),
|
||||||
newTestMember(1, nil, "", []string{"http://192.0.2.1", "http://192.0.2.2"}),
|
newTestMember(1, nil, "", []string{"http://192.0.2.1", "http://192.0.2.2"}),
|
||||||
|
@ -262,13 +260,13 @@ func TestClusterClientURLs(t *testing.T) {
|
||||||
|
|
||||||
// no members
|
// no members
|
||||||
{
|
{
|
||||||
mems: []Member{},
|
mems: []*Member{},
|
||||||
wurls: []string{},
|
wurls: []string{},
|
||||||
},
|
},
|
||||||
|
|
||||||
// peer with no client urls
|
// peer with no client urls
|
||||||
{
|
{
|
||||||
mems: []Member{
|
mems: []*Member{
|
||||||
newTestMember(3, nil, "", []string{}),
|
newTestMember(3, nil, "", []string{}),
|
||||||
},
|
},
|
||||||
wurls: []string{},
|
wurls: []string{},
|
||||||
|
@ -286,34 +284,34 @@ func TestClusterClientURLs(t *testing.T) {
|
||||||
|
|
||||||
func TestClusterValidateAndAssignIDsBad(t *testing.T) {
|
func TestClusterValidateAndAssignIDsBad(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
clmembs []Member
|
clmembs []*Member
|
||||||
membs []*Member
|
membs []*Member
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
// unmatched length
|
// unmatched length
|
||||||
[]Member{
|
[]*Member{
|
||||||
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
||||||
},
|
},
|
||||||
[]*Member{},
|
[]*Member{},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// unmatched peer urls
|
// unmatched peer urls
|
||||||
[]Member{
|
[]*Member{
|
||||||
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
||||||
},
|
},
|
||||||
[]*Member{
|
[]*Member{
|
||||||
newTestMemberp(1, []string{"http://127.0.0.1:4001"}, "", nil),
|
newTestMember(1, []string{"http://127.0.0.1:4001"}, "", nil),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// unmatched peer urls
|
// unmatched peer urls
|
||||||
[]Member{
|
[]*Member{
|
||||||
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
||||||
newTestMember(2, []string{"http://127.0.0.2:2379"}, "", nil),
|
newTestMember(2, []string{"http://127.0.0.2:2379"}, "", nil),
|
||||||
},
|
},
|
||||||
[]*Member{
|
[]*Member{
|
||||||
newTestMemberp(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
||||||
newTestMemberp(2, []string{"http://127.0.0.2:4001"}, "", nil),
|
newTestMember(2, []string{"http://127.0.0.2:4001"}, "", nil),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -327,18 +325,18 @@ func TestClusterValidateAndAssignIDsBad(t *testing.T) {
|
||||||
|
|
||||||
func TestClusterValidateAndAssignIDs(t *testing.T) {
|
func TestClusterValidateAndAssignIDs(t *testing.T) {
|
||||||
tests := []struct {
|
tests := []struct {
|
||||||
clmembs []Member
|
clmembs []*Member
|
||||||
membs []*Member
|
membs []*Member
|
||||||
wids []types.ID
|
wids []types.ID
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
[]Member{
|
[]*Member{
|
||||||
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
newTestMember(1, []string{"http://127.0.0.1:2379"}, "", nil),
|
||||||
newTestMember(2, []string{"http://127.0.0.2:2379"}, "", nil),
|
newTestMember(2, []string{"http://127.0.0.2:2379"}, "", nil),
|
||||||
},
|
},
|
||||||
[]*Member{
|
[]*Member{
|
||||||
newTestMemberp(3, []string{"http://127.0.0.1:2379"}, "", nil),
|
newTestMember(3, []string{"http://127.0.0.1:2379"}, "", nil),
|
||||||
newTestMemberp(4, []string{"http://127.0.0.2:2379"}, "", nil),
|
newTestMember(4, []string{"http://127.0.0.2:2379"}, "", nil),
|
||||||
},
|
},
|
||||||
[]types.ID{3, 4},
|
[]types.ID{3, 4},
|
||||||
},
|
},
|
||||||
|
@ -426,7 +424,7 @@ func TestClusterValidateConfigurationChange(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestClusterGenID(t *testing.T) {
|
func TestClusterGenID(t *testing.T) {
|
||||||
cs := newTestCluster([]Member{
|
cs := newTestCluster([]*Member{
|
||||||
newTestMember(1, nil, "", nil),
|
newTestMember(1, nil, "", nil),
|
||||||
newTestMember(2, nil, "", nil),
|
newTestMember(2, nil, "", nil),
|
||||||
})
|
})
|
||||||
|
@ -438,7 +436,7 @@ func TestClusterGenID(t *testing.T) {
|
||||||
previd := cs.ID()
|
previd := cs.ID()
|
||||||
|
|
||||||
cs.SetStore(&storeRecorder{})
|
cs.SetStore(&storeRecorder{})
|
||||||
cs.AddMember(newTestMemberp(3, nil, "", nil))
|
cs.AddMember(newTestMember(3, nil, "", nil))
|
||||||
cs.genID()
|
cs.genID()
|
||||||
if cs.ID() == previd {
|
if cs.ID() == previd {
|
||||||
t.Fatalf("cluster.ID = %v, want not %v", cs.ID(), previd)
|
t.Fatalf("cluster.ID = %v, want not %v", cs.ID(), previd)
|
||||||
|
@ -481,7 +479,7 @@ func TestClusterAddMember(t *testing.T) {
|
||||||
st := &storeRecorder{}
|
st := &storeRecorder{}
|
||||||
c := newTestCluster(nil)
|
c := newTestCluster(nil)
|
||||||
c.SetStore(st)
|
c.SetStore(st)
|
||||||
c.AddMember(newTestMemberp(1, nil, "node1", nil))
|
c.AddMember(newTestMember(1, nil, "node1", nil))
|
||||||
|
|
||||||
wactions := []action{
|
wactions := []action{
|
||||||
{
|
{
|
||||||
|
@ -535,32 +533,32 @@ func TestClusterMembers(t *testing.T) {
|
||||||
func TestClusterString(t *testing.T) {
|
func TestClusterString(t *testing.T) {
|
||||||
cls := &Cluster{
|
cls := &Cluster{
|
||||||
members: map[types.ID]*Member{
|
members: map[types.ID]*Member{
|
||||||
1: newTestMemberp(
|
1: newTestMember(
|
||||||
1,
|
1,
|
||||||
[]string{"http://1.1.1.1:1111", "http://0.0.0.0:0000"},
|
[]string{"http://1.1.1.1:1111", "http://0.0.0.0:0000"},
|
||||||
"abc",
|
"abc",
|
||||||
nil,
|
nil,
|
||||||
),
|
),
|
||||||
2: newTestMemberp(
|
2: newTestMember(
|
||||||
2,
|
2,
|
||||||
[]string{"http://2.2.2.2:2222"},
|
[]string{"http://2.2.2.2:2222"},
|
||||||
"def",
|
"def",
|
||||||
nil,
|
nil,
|
||||||
),
|
),
|
||||||
3: newTestMemberp(
|
3: newTestMember(
|
||||||
3,
|
3,
|
||||||
[]string{"http://3.3.3.3:1234", "http://127.0.0.1:7001"},
|
[]string{"http://3.3.3.3:1234", "http://127.0.0.1:7001"},
|
||||||
"ghi",
|
"ghi",
|
||||||
nil,
|
nil,
|
||||||
),
|
),
|
||||||
// no PeerURLs = not included
|
// no PeerURLs = not included
|
||||||
4: newTestMemberp(
|
4: newTestMember(
|
||||||
4,
|
4,
|
||||||
[]string{},
|
[]string{},
|
||||||
"four",
|
"four",
|
||||||
nil,
|
nil,
|
||||||
),
|
),
|
||||||
5: newTestMemberp(
|
5: newTestMember(
|
||||||
5,
|
5,
|
||||||
nil,
|
nil,
|
||||||
"five",
|
"five",
|
||||||
|
@ -605,24 +603,11 @@ func TestNodeToMember(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func newTestCluster(membs []Member) *Cluster {
|
func newTestCluster(membs []*Member) *Cluster {
|
||||||
c := &Cluster{members: make(map[types.ID]*Member), removed: make(map[types.ID]bool)}
|
c := &Cluster{members: make(map[types.ID]*Member), removed: make(map[types.ID]bool)}
|
||||||
c.store = store.New()
|
c.store = store.New()
|
||||||
for i := range membs {
|
for i := range membs {
|
||||||
c.AddMember(&membs[i])
|
c.AddMember(membs[i])
|
||||||
}
|
}
|
||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
func newTestMember(id uint64, peerURLs []string, name string, clientURLs []string) Member {
|
|
||||||
return Member{
|
|
||||||
ID: types.ID(id),
|
|
||||||
RaftAttributes: RaftAttributes{PeerURLs: peerURLs},
|
|
||||||
Attributes: Attributes{Name: name, ClientURLs: clientURLs},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newTestMemberp(id uint64, peerURLs []string, name string, clientURLs []string) *Member {
|
|
||||||
m := newTestMember(id, peerURLs, name, clientURLs)
|
|
||||||
return &m
|
|
||||||
}
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ func TestMemberPick(t *testing.T) {
|
||||||
urls map[string]bool
|
urls map[string]bool
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
newTestMemberp(1, []string{"abc", "def", "ghi", "jkl", "mno", "pqr", "stu"}, "", nil),
|
newTestMember(1, []string{"abc", "def", "ghi", "jkl", "mno", "pqr", "stu"}, "", nil),
|
||||||
map[string]bool{
|
map[string]bool{
|
||||||
"abc": true,
|
"abc": true,
|
||||||
"def": true,
|
"def": true,
|
||||||
|
@ -75,7 +75,7 @@ func TestMemberPick(t *testing.T) {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
newTestMemberp(2, []string{"xyz"}, "", nil),
|
newTestMember(2, []string{"xyz"}, "", nil),
|
||||||
map[string]bool{"xyz": true},
|
map[string]bool{"xyz": true},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -92,10 +92,10 @@ func TestMemberPick(t *testing.T) {
|
||||||
|
|
||||||
func TestMemberClone(t *testing.T) {
|
func TestMemberClone(t *testing.T) {
|
||||||
tests := []*Member{
|
tests := []*Member{
|
||||||
newTestMemberp(1, nil, "abc", nil),
|
newTestMember(1, nil, "abc", nil),
|
||||||
newTestMemberp(1, []string{"http://a"}, "abc", nil),
|
newTestMember(1, []string{"http://a"}, "abc", nil),
|
||||||
newTestMemberp(1, nil, "abc", []string{"http://b"}),
|
newTestMember(1, nil, "abc", []string{"http://b"}),
|
||||||
newTestMemberp(1, []string{"http://a"}, "abc", []string{"http://b"}),
|
newTestMember(1, []string{"http://a"}, "abc", []string{"http://b"}),
|
||||||
}
|
}
|
||||||
for i, tt := range tests {
|
for i, tt := range tests {
|
||||||
nm := tt.Clone()
|
nm := tt.Clone()
|
||||||
|
@ -107,3 +107,11 @@ func TestMemberClone(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func newTestMember(id uint64, peerURLs []string, name string, clientURLs []string) *Member {
|
||||||
|
return &Member{
|
||||||
|
ID: types.ID(id),
|
||||||
|
RaftAttributes: RaftAttributes{PeerURLs: peerURLs},
|
||||||
|
Attributes: Attributes{Name: name, ClientURLs: clientURLs},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestSendHubInitSenders(t *testing.T) {
|
func TestSendHubInitSenders(t *testing.T) {
|
||||||
membs := []Member{
|
membs := []*Member{
|
||||||
newTestMember(1, []string{"http://a"}, "", nil),
|
newTestMember(1, []string{"http://a"}, "", nil),
|
||||||
newTestMember(2, []string{"http://b"}, "", nil),
|
newTestMember(2, []string{"http://b"}, "", nil),
|
||||||
newTestMember(3, []string{"http://c"}, "", nil),
|
newTestMember(3, []string{"http://c"}, "", nil),
|
||||||
|
@ -48,7 +48,7 @@ func TestSendHubAdd(t *testing.T) {
|
||||||
cl := newTestCluster(nil)
|
cl := newTestCluster(nil)
|
||||||
ls := stats.NewLeaderStats("")
|
ls := stats.NewLeaderStats("")
|
||||||
h := newSendHub(nil, cl, nil, ls)
|
h := newSendHub(nil, cl, nil, ls)
|
||||||
m := newTestMemberp(1, []string{"http://a"}, "", nil)
|
m := newTestMember(1, []string{"http://a"}, "", nil)
|
||||||
h.Add(m)
|
h.Add(m)
|
||||||
|
|
||||||
if _, ok := ls.Followers["1"]; !ok {
|
if _, ok := ls.Followers["1"]; !ok {
|
||||||
|
@ -70,7 +70,7 @@ func TestSendHubAdd(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestSendHubRemove(t *testing.T) {
|
func TestSendHubRemove(t *testing.T) {
|
||||||
membs := []Member{
|
membs := []*Member{
|
||||||
newTestMember(1, []string{"http://a"}, "", nil),
|
newTestMember(1, []string{"http://a"}, "", nil),
|
||||||
}
|
}
|
||||||
cl := newTestCluster(membs)
|
cl := newTestCluster(membs)
|
||||||
|
|
|
@ -407,7 +407,7 @@ func TestApplyRequest(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestApplyRequestOnAdminMemberAttributes(t *testing.T) {
|
func TestApplyRequestOnAdminMemberAttributes(t *testing.T) {
|
||||||
cl := newTestCluster([]Member{{ID: 1}})
|
cl := newTestCluster([]*Member{{ID: 1}})
|
||||||
srv := &EtcdServer{
|
srv := &EtcdServer{
|
||||||
store: &storeRecorder{},
|
store: &storeRecorder{},
|
||||||
Cluster: cl,
|
Cluster: cl,
|
||||||
|
@ -992,7 +992,7 @@ func TestRemoveMember(t *testing.T) {
|
||||||
Nodes: []uint64{1234, 2345, 3456},
|
Nodes: []uint64{1234, 2345, 3456},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
cl := newTestCluster([]Member{{ID: 1234}})
|
cl := newTestCluster([]*Member{{ID: 1234}})
|
||||||
s := &EtcdServer{
|
s := &EtcdServer{
|
||||||
node: n,
|
node: n,
|
||||||
store: &storeRecorder{},
|
store: &storeRecorder{},
|
||||||
|
@ -1101,25 +1101,25 @@ func TestGetOtherPeerURLs(t *testing.T) {
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
[]*Member{
|
[]*Member{
|
||||||
newTestMemberp(1, []string{"http://10.0.0.1"}, "a", nil),
|
newTestMember(1, []string{"http://10.0.0.1"}, "a", nil),
|
||||||
},
|
},
|
||||||
"a",
|
"a",
|
||||||
[]string{},
|
[]string{},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
[]*Member{
|
[]*Member{
|
||||||
newTestMemberp(1, []string{"http://10.0.0.1"}, "a", nil),
|
newTestMember(1, []string{"http://10.0.0.1"}, "a", nil),
|
||||||
newTestMemberp(2, []string{"http://10.0.0.2"}, "b", nil),
|
newTestMember(2, []string{"http://10.0.0.2"}, "b", nil),
|
||||||
newTestMemberp(3, []string{"http://10.0.0.3"}, "c", nil),
|
newTestMember(3, []string{"http://10.0.0.3"}, "c", nil),
|
||||||
},
|
},
|
||||||
"a",
|
"a",
|
||||||
[]string{"http://10.0.0.2", "http://10.0.0.3"},
|
[]string{"http://10.0.0.2", "http://10.0.0.3"},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
[]*Member{
|
[]*Member{
|
||||||
newTestMemberp(1, []string{"http://10.0.0.1"}, "a", nil),
|
newTestMember(1, []string{"http://10.0.0.1"}, "a", nil),
|
||||||
newTestMemberp(3, []string{"http://10.0.0.3"}, "c", nil),
|
newTestMember(3, []string{"http://10.0.0.3"}, "c", nil),
|
||||||
newTestMemberp(2, []string{"http://10.0.0.2"}, "b", nil),
|
newTestMember(2, []string{"http://10.0.0.2"}, "b", nil),
|
||||||
},
|
},
|
||||||
"a",
|
"a",
|
||||||
[]string{"http://10.0.0.2", "http://10.0.0.3"},
|
[]string{"http://10.0.0.2", "http://10.0.0.3"},
|
||||||
|
|
Loading…
Reference in New Issue