Merge pull request #14521 from lovehhf/remove_pick_peer_url

membership: Remove PickPeerURL Method

server/etcdserver/api/membership/member.go

@@ -18,7 +18,6 @@ import (
 	"crypto/sha1"
 	"encoding/binary"
 	"fmt"
-	"math/rand"
 	"sort"
 	"strings"
 	"time"
@@ -88,15 +87,6 @@ func newMember(name string, peerURLs types.URLs, memberId types.ID, isLearner bo
 	return m
 }
 
-// PickPeerURL chooses a random address from a given Member's PeerURLs.
-// It will panic if there is no PeerURLs available in Member.
-func (m *Member) PickPeerURL() string {
-	if len(m.PeerURLs) == 0 {
-		panic("member should always have some peer url")
-	}
-	return m.PeerURLs[rand.Intn(len(m.PeerURLs))]
-}
-
 func (m *Member) Clone() *Member {
 	if m == nil {
 		return nil

server/etcdserver/api/membership/member_test.go

@@ -55,39 +55,6 @@ func TestMemberTime(t *testing.T) {
 	}
 }
 
-func TestMemberPick(t *testing.T) {
-	tests := []struct {
-		memb *Member
-		urls map[string]bool
-	}{
-		{
-			newTestMember(1, []string{"abc", "def", "ghi", "jkl", "mno", "pqr", "stu"}, "", nil),
-			map[string]bool{
-				"abc": true,
-				"def": true,
-				"ghi": true,
-				"jkl": true,
-				"mno": true,
-				"pqr": true,
-				"stu": true,
-			},
-		},
-		{
-			newTestMember(2, []string{"xyz"}, "", nil),
-			map[string]bool{"xyz": true},
-		},
-	}
-	for i, tt := range tests {
-		for j := 0; j < 1000; j++ {
-			a := tt.memb.PickPeerURL()
-			if !tt.urls[a] {
-				t.Errorf("#%d: returned ID %q not in expected range!", i, a)
-				break
-			}
-		}
-	}
-}
-
 func TestMemberClone(t *testing.T) {
 	tests := []*Member{
 		newTestMember(1, nil, "abc", nil),