mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

etcdserver: Member.Pick -> Member.PickPeerURL

Browse Source
This commit is contained in:
Yicheng Qin
2014-10-23 11:13:27 -07:00
parent 67412e07f8
commit d2c4e981ed
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
etcdserver/member.go
View File

@ -72,9 +72,9 @@ func NewMember(name string, peerURLs types.URLs, clusterName string, now *time.T
return m return m
} }
// Pick chooses a random address from a given Member's addresses, and returns it as // PickPeerURL chooses a random address from a given Member's PeerURLs.
// an addressible URI. If the given member does not exist, an empty string is returned. // It will panic if there is no PeerURLs available in Member.
func (m *Member) Pick() string { func (m *Member) PickPeerURL() string {
if len(m.PeerURLs) == 0 { if len(m.PeerURLs) == 0 {
panic("member should always have some peer url") panic("member should always have some peer url")
} }

2
etcdserver/member_test.go
View File

@ -78,7 +78,7 @@ func TestMemberPick(t *testing.T) {
} }
for i, tt := range tests { for i, tt := range tests {
for j := 0; j < 1000; j++ { for j := 0; j < 1000; j++ {
a := tt.memb.Pick() a := tt.memb.PickPeerURL()
if !tt.urls[a] { if !tt.urls[a] {
t.Errorf("#%d: returned ID %q not in expected range!", i, a) t.Errorf("#%d: returned ID %q not in expected range!", i, a)
break break

2
etcdserver/sender.go
View File

@ -60,7 +60,7 @@ func send(c *http.Client, cl *Cluster, m raftpb.Message, ss *stats.ServerStats,
log.Printf("etcdhttp: no member for %d", m.To) log.Printf("etcdhttp: no member for %d", m.To)
return return
} }
u := fmt.Sprintf("%s%s", memb.Pick(), raftPrefix) u := fmt.Sprintf("%s%s", memb.PickPeerURL(), raftPrefix)
// TODO: don't block. we should be able to have 1000s // TODO: don't block. we should be able to have 1000s
// of messages out at a time. // of messages out at a time.