Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

integration: improve TestTransferLeader

Browse Source 
so that it can check leader transition
This commit is contained in:
Gyu-Ho Lee 2016-08-19 13:02:22 -07:00
parent 5e6d2a23b7
commit eaa5d9772f
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
integration/cluster.go
View File

@ -702,13 +702,13 @@ func (m *member) Stop(t *testing.T) {
plog.Printf("stopped %s (%s)", m.Name, m.grpcAddr)
}
// StopWithAutoLeaderTransfer stops the member with auto leader transfer.
func (m *member) StopWithAutoLeaderTransfer(t *testing.T) {
plog.Printf("stopping %s (%s)", m.Name, m.grpcAddr)
m.s.TransferLeadership()
m.Close()
m.hss = nil
plog.Printf("stopped %s (%s)", m.Name, m.grpcAddr)
// checkLeaderTransition waits for leader transition, returning the new leader ID.
func checkLeaderTransition(t *testing.T, m *member, oldLead uint64) uint64 {
interval := time.Duration(m.s.Cfg.TickMs) * time.Millisecond
for m.s.Lead() == 0 || (m.s.Lead() == oldLead) {
time.Sleep(interval)
}
return m.s.Lead()
}
// StopNotify unblocks when a member stop completes

53
integration/cluster_test.go
View File

@ -26,7 +26,6 @@ import (
"github.com/coreos/etcd/client"
"github.com/coreos/etcd/etcdserver"
"github.com/coreos/etcd/etcdserver/etcdserverpb"
"github.com/coreos/etcd/pkg/testutil"
"golang.org/x/net/context"
@ -470,29 +469,41 @@ func TestTransferLeader(t *testing.T) {
clus := NewClusterV3(t, &ClusterConfig{Size: 3})
defer clus.Terminate(t)
leaderIdx := clus.WaitLeader(t)
err := clus.Members[leaderIdx].s.TransferLeadership()
if err != nil {
t.Fatal(err)
}
}
func TestTransferLeaderStopTrigger(t *testing.T) {
defer testutil.AfterTest(t)
clus := NewClusterV3(t, &ClusterConfig{Size: 3})
defer clus.Terminate(t)
oldLeadIdx := clus.WaitLeader(t)
clus.Members[oldLeadIdx].StopWithAutoLeaderTransfer(t)
oldLeadID := uint64(clus.Members[oldLeadIdx].s.ID())
// issue put to one of the other member
kvc := toGRPC(clus.Client((oldLeadIdx + 1) % 3)).KV
sctx, scancel := context.WithTimeout(context.TODO(), clus.Members[oldLeadIdx].electionTimeout())
_, err := kvc.Range(sctx, &etcdserverpb.RangeRequest{Key: []byte("foo")})
scancel()
// ensure followers go through leader transition while learship transfer
idc := make(chan uint64)
for i := range clus.Members {
if oldLeadIdx != i {
go func(m *member) {
idc <- checkLeaderTransition(t, m, oldLeadID)
}(clus.Members[i])
}
}
err := clus.Members[oldLeadIdx].s.TransferLeadership()
if err != nil {
t.Fatal(err)
}
// wait until leader transitions have happened
var newLeadIDs [2]uint64
for i := range newLeadIDs {
select {
case newLeadIDs[i] = <-idc:
case <-time.After(time.Second):
t.Fatal("timed out waiting for leader transition")
}
}
// remaining members must agree on the same leader
if newLeadIDs[0] != newLeadIDs[1] {
t.Fatalf("expected same new leader %d == %d", newLeadIDs[0], newLeadIDs[1])
}
// new leader must be different than the old leader
if oldLeadID == newLeadIDs[0] {
t.Fatalf("expected old leader %d != new leader %d", oldLeadID, newLeadIDs[0])
}
}