luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Fix flaky TestAutopilot_BootstrapExpect (#7242)

This commit is contained in:
Sarah Christoff 2020-02-10 14:52:58 -06:00 committed by GitHub
parent 89ef5d8ccf
commit 85d2714c76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
agent/consul/autopilot_test.go
View File

@ -399,13 +399,13 @@ func TestAutopilot_PromoteNonVoter(t *testing.T) {
}) })
} }
func TestAutopilot_BootstrapExpect(t *testing.T) { func TestAutopilot_MinQuorum(t *testing.T) {
dc := "dc1" dc := "dc1"
closeMap := make(map[string]chan struct{}) closeMap := make(map[string]chan struct{})
conf := func(c *Config) { conf := func(c *Config) {
c.Datacenter = dc c.Datacenter = dc
c.Bootstrap = false c.Bootstrap = false
c.BootstrapExpect = 3 c.BootstrapExpect = 4
c.AutopilotConfig.MinQuorum = 3 c.AutopilotConfig.MinQuorum = 3
c.RaftConfig.ProtocolVersion = raft.ProtocolVersion(2) c.RaftConfig.ProtocolVersion = raft.ProtocolVersion(2)
c.AutopilotInterval = 100 * time.Millisecond c.AutopilotInterval = 100 * time.Millisecond
@ -446,29 +446,30 @@ func TestAutopilot_BootstrapExpect(t *testing.T) {
//Differentiate between leader and server //Differentiate between leader and server
findStatus := func(leader bool) *Server { findStatus := func(leader bool) *Server {
for _, mem := range servers { for _, mem := range servers {
if mem.IsLeader() && leader { if mem.IsLeader() == leader {
return mem return mem
} }
if !leader && !mem.IsLeader() { if !mem.IsLeader() == !leader {
return mem return mem
} }
} }
t.Fatalf("no members set")
return nil return nil
} }
testrpc.WaitForLeader(t, s1.RPC, dc)
for _, s := range servers {
testrpc.WaitForLeader(t, s.RPC, dc)
retry.Run(t, func(r *retry.R) { r.Check(wantPeers(s, 4)) })
}
// Have autopilot take one into left // Have autopilot take one into left
dead := findStatus(false) dead := findStatus(false)
if dead == nil {
t.Fatalf("no members set")
}
dead.Shutdown() dead.Shutdown()
<-closeMap[dead.config.NodeName] <-closeMap[dead.config.NodeName]
retry.Run(t, func(r *retry.R) { retry.Run(t, func(r *retry.R) {
leader := findStatus(true) leader := findStatus(true)
if leader == nil {
r.Fatalf("no members set")
}
for _, m := range leader.LANMembers() { for _, m := range leader.LANMembers() {
if m.Name == dead.config.NodeName && m.Status != serf.StatusLeft { if m.Name == dead.config.NodeName && m.Status != serf.StatusLeft {
r.Fatalf("%v should be left, got %v", m.Name, m.Status.String()) r.Fatalf("%v should be left, got %v", m.Name, m.Status.String())
@ -479,11 +480,16 @@ func TestAutopilot_BootstrapExpect(t *testing.T) {
delete(servers, dead.config.NodeName) delete(servers, dead.config.NodeName)
//Autopilot should not take this one into left //Autopilot should not take this one into left
dead = findStatus(false) dead = findStatus(false)
dead.Shutdown() if err := dead.Shutdown(); err != nil {
t.Fatalf("could not shut down %s, error %v", dead.config.NodeName, err)
}
<-closeMap[dead.config.NodeName] <-closeMap[dead.config.NodeName]
retry.Run(t, func(r *retry.R) { retry.Run(t, func(r *retry.R) {
leader := findStatus(true) leader := findStatus(true)
if leader == nil {
r.Fatalf("no members set")
}
for _, m := range leader.LANMembers() { for _, m := range leader.LANMembers() {
if m.Name == dead.config.NodeName && m.Status != serf.StatusFailed { if m.Name == dead.config.NodeName && m.Status != serf.StatusFailed {
r.Fatalf("%v should be failed, got %v", m.Name, m.Status.String()) r.Fatalf("%v should be failed, got %v", m.Name, m.Status.String())