Merge pull request #458 from hashicorp/dnephin/fix-flaky-test-1

Fix flaky TestRaft_LeadershipTransferLeaderRejectsClientRequests

raft.go

@@ -347,10 +347,7 @@ func (r *Raft) setLeadershipTransferInProgress(v bool) {
 
 func (r *Raft) getLeadershipTransferInProgress() bool {
 	v := atomic.LoadInt32(&r.leaderState.leadershipTransferInProgress)
-	if v == 1 {
-		return true
-	}
-	return false
+	return v == 1
 }
 
 func (r *Raft) setupLeaderState() {

raft_test.go

@@ -123,7 +123,7 @@ func TestRaft_RecoverCluster(t *testing.T) {
 	// snapshot + log scenarios. By sweeping through the trailing logs value
 	// we will also hit the case where we have a snapshot only.
 	var err error
-	runRecover := func(applies int) {
+	runRecover := func(t *testing.T, applies int) {
 		conf := inmemConfig(t)
 		conf.TrailingLogs = 10
 		c := MakeCluster(3, t, conf)
@@ -213,7 +213,7 @@ func TestRaft_RecoverCluster(t *testing.T) {
 	}
 	for applies := 0; applies < 20; applies++ {
 		t.Run(fmt.Sprintf("%d applies", applies), func(t *testing.T) {
-			runRecover(applies)
+			runRecover(t, applies)
 		})
 	}
 }
@@ -2059,18 +2059,18 @@ func TestRaft_LeadershipTransferLeaderRejectsClientRequests(t *testing.T) {
 		l.requestConfigChange(configurationChangeRequest{}, 100*time.Millisecond),
 	}
 	futures = append(futures, l.LeadershipTransfer())
-	select {
-	case <-l.leadershipTransferCh:
-	default:
-	}
-
-	futures = append(futures, l.LeadershipTransferToServer(ServerID(""), ServerAddress("")))
 
 	for i, f := range futures {
+		t.Logf("waiting on future %v", i)
 		if f.Error() != ErrLeadershipTransferInProgress {
 			t.Errorf("case %d: should have errored with: %s, instead of %s", i, ErrLeadershipTransferInProgress, f.Error())
 		}
 	}
+
+	f := l.LeadershipTransferToServer(ServerID(""), ServerAddress(""))
+	if f.Error() != ErrLeadershipTransferInProgress {
+		t.Errorf("should have errored with: %s, instead of %s", ErrLeadershipTransferInProgress, f.Error())
+	}
 }
 
 func TestRaft_LeadershipTransferLeaderReplicationTimeout(t *testing.T) {