Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

join, etcdutil: enable linearizable in MemberList #8564

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

join, etcdutil: enable linearizable in MemberList #8564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkg/utils/etcdutil/etcdutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func AddEtcdMember(client *clientv3.Client, urls []string) (*clientv3.MemberAddR
}

// ListEtcdMembers returns a list of internal etcd members.
func ListEtcdMembers(ctx context.Context, client *clientv3.Client) (*clientv3.MemberListResponse, error) {
func ListEtcdMembers(ctx context.Context, client *clientv3.Client, linearizables ...bool) (*clientv3.MemberListResponse, error) {
failpoint.Inject("SlowEtcdMemberList", func(val failpoint.Value) {
d := val.(int)
time.Sleep(time.Duration(d) * time.Second)
Expand All @@ -125,7 +125,12 @@ func ListEtcdMembers(ctx context.Context, client *clientv3.Client) (*clientv3.Me
// If Linearizable is set to false, the member list will be returned with server's local data.
// If Linearizable is set to true, it is served with linearizable guarantee. If the server is disconnected from quorum, `MemberList` call will fail.
c := clientv3.RetryClusterClient(client)
resp, err := c.MemberList(newCtx, &etcdserverpb.MemberListRequest{Linearizable: false})
linearizable := true
if len(linearizables) > 0 {
linearizable = linearizables[0]
}

resp, err := c.MemberList(newCtx, &etcdserverpb.MemberListRequest{Linearizable: linearizable})
cancel()
if err != nil {
return (*clientv3.MemberListResponse)(resp), errs.ErrEtcdMemberList.Wrap(err).GenWithStackByCause()
Expand Down
2 changes: 2 additions & 0 deletions pkg/utils/etcdutil/etcdutil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ func checkEtcdClientHealth(re *require.Assertions, client *clientv3.Client) {

func TestEtcdScaleInAndOut(t *testing.T) {
re := require.New(t)
re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/utils/etcdutil/fastTick", "return(true)"))
// Start a etcd server.
servers, _, clean := NewTestEtcdCluster(t, 1)
defer clean()
Expand All @@ -249,6 +250,7 @@ func TestEtcdScaleInAndOut(t *testing.T) {
_, err = RemoveEtcdMember(client1, uint64(etcd1.Server.ID()))
re.NoError(err)
checkMembers(re, client2, []*embed.Etcd{etcd2})
re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/utils/etcdutil/fastTick"))
}

func TestRandomKillEtcd(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions pkg/utils/etcdutil/testutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,17 @@ func MustAddEtcdMember(t *testing.T, cfg1 *embed.Config, client *clientv3.Client
peerURL := cfg2.ListenPeerUrls[0].String()
addResp, err := AddEtcdMember(client, []string{peerURL})
re.NoError(err)
// Start the new etcd member.
etcd2, err := embed.StartEtcd(cfg2)
re.NoError(err)
re.Equal(uint64(etcd2.Server.ID()), addResp.Member.ID)
<-etcd2.Server.ReadyNotify()
// Check the client can get the new member.
testutil.Eventually(re, func() bool {
members, err := ListEtcdMembers(client.Ctx(), client)
re.NoError(err)
return len(addResp.Members) == len(members.Members)
})
// Start the new etcd member.
etcd2, err := embed.StartEtcd(cfg2)
re.NoError(err)
re.Equal(uint64(etcd2.Server.ID()), addResp.Member.ID)
<-etcd2.Server.ReadyNotify()
return etcd2
}

Expand Down
12 changes: 10 additions & 2 deletions server/join/join.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ func PrepareJoinCluster(cfg *config.Config) error {
return err
}

originMembers := listResp.Members
existed := false
for _, m := range listResp.Members {
for _, m := range originMembers {
if len(m.Name) == 0 {
log.Error("there is an abnormal joined member in the current member list",
zap.Uint64("id", m.ID),
Expand Down Expand Up @@ -174,8 +175,15 @@ func PrepareJoinCluster(cfg *config.Config) error {
listSucc bool
)

// If there is only one member in the cluster, the cluster maybe lost leader
// since quorum is not active after adding the new member.
linearizable := true
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ref #8552

if len(originMembers) == 1 {
linearizable = false
}

for i := 0; i < listMemberRetryTimes; i++ {
listResp, err = etcdutil.ListEtcdMembers(client.Ctx(), client)
listResp, err = etcdutil.ListEtcdMembers(client.Ctx(), client, linearizable)
if err != nil {
return err
}
Expand Down
12 changes: 12 additions & 0 deletions tests/server/join/join_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,18 @@ func TestFailedAndDeletedPDJoinsPreviousCluster(t *testing.T) {
members, err := etcdutil.ListEtcdMembers(ctx, client)
re.NoError(err)
re.Len(members.Members, 2)

// Join another PD.
pd4, err := cluster.Join(ctx)
re.NoError(err)
err = pd4.Run()
re.NoError(err)
_, err = os.Stat(filepath.Join(pd4.GetConfig().DataDir, "join"))
re.False(os.IsNotExist(err))
re.NotEmpty(cluster.WaitLeader())
members, err = etcdutil.ListEtcdMembers(ctx, client)
re.NoError(err)
re.Len(members.Members, 3)
}

// A deleted PD joins the previous cluster.
Expand Down