From 0d9b6ba0ab6198df7e5f4aa1ac59dedaa484aa4c Mon Sep 17 00:00:00 2001
From: "swingbach@gmail.com" <swingbach@gmail.com>
Date: Mon, 11 Jul 2016 14:59:53 +0800
Subject: [PATCH] raft: fix a few problems

---
 raft/raft.go            | 19 +++++++++++++------
 raft/raft_paper_test.go |  4 ++--
 raft/raft_test.go       |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/raft/raft.go b/raft/raft.go
index 9d21bf04e..f6077227b 100644
--- a/raft/raft.go
+++ b/raft/raft.go
@@ -39,8 +39,10 @@ const (
 
 // Possible values for CampaignType
 const (
-	LeaderElection CampaignType = "LeaderElection"
-	LeaderTransfer CampaignType = "LeaderTransfer"
+	// campaignElection represents the type of normal election
+	campaignElection CampaignType = "CampaignElection"
+	// campaignTransfer represents the type of leader transfer
+	campaignTransfer CampaignType = "CampaignTransfer"
 )
 
 // CampaignType represents the type of campaigning
@@ -544,7 +546,12 @@ func (r *raft) campaign(t CampaignType) {
 		}
 		r.logger.Infof("%x [logterm: %d, index: %d] sent vote request to %x at term %d",
 			r.id, r.raftLog.lastTerm(), r.raftLog.lastIndex(), id, r.Term)
-		r.send(pb.Message{To: id, Type: pb.MsgVote, Index: r.raftLog.lastIndex(), LogTerm: r.raftLog.lastTerm(), Entries: []pb.Entry{{Data: []byte(t)}}})
+
+		var entries []pb.Entry
+		if t == campaignTransfer {
+			entries = []pb.Entry{{Data: []byte(t)}}
+		}
+		r.send(pb.Message{To: id, Type: pb.MsgVote, Index: r.raftLog.lastIndex(), LogTerm: r.raftLog.lastTerm(), Entries: entries})
 	}
 }
 
@@ -569,7 +576,7 @@ func (r *raft) Step(m pb.Message) error {
 	if m.Type == pb.MsgHup {
 		if r.state != StateLeader {
 			r.logger.Infof("%x is starting a new election at term %d", r.id, r.Term)
-			r.campaign(LeaderElection)
+			r.campaign(campaignElection)
 		} else {
 			r.logger.Debugf("%x ignoring MsgHup because already leader", r.id)
 		}
@@ -587,7 +594,7 @@ func (r *raft) Step(m pb.Message) error {
 	case m.Term > r.Term:
 		lead := m.From
 		if m.Type == pb.MsgVote {
-			force := len(m.Entries) == 1 && bytes.Equal(m.Entries[0].Data, []byte(LeaderTransfer))
+			force := len(m.Entries) == 1 && bytes.Equal(m.Entries[0].Data, []byte(campaignTransfer))
 			inLease := r.checkQuorum && r.state != StateCandidate && r.electionElapsed < r.electionTimeout
 			if !force && inLease {
 				// If a server receives a RequestVote request within the minimum election timeout
@@ -856,7 +863,7 @@ func stepFollower(r *raft, m pb.Message) {
 		}
 	case pb.MsgTimeoutNow:
 		r.logger.Infof("%x [term %d] received MsgTimeoutNow from %x and starts an election to get leadership.", r.id, r.Term, m.From)
-		r.campaign(LeaderTransfer)
+		r.campaign(campaignTransfer)
 	case pb.MsgReadIndex:
 		if r.lead == None {
 			r.logger.Infof("%x no leader at term %d; dropping index reading msg", r.id, r.Term)
diff --git a/raft/raft_paper_test.go b/raft/raft_paper_test.go
index 8990f4ef3..cd5c3e94e 100644
--- a/raft/raft_paper_test.go
+++ b/raft/raft_paper_test.go
@@ -175,8 +175,8 @@ func testNonleaderStartElection(t *testing.T, state StateType) {
 	msgs := r.readMessages()
 	sort.Sort(messageSlice(msgs))
 	wmsgs := []pb.Message{
-		{From: 1, To: 2, Term: 2, Type: pb.MsgVote, Entries: []pb.Entry{{Data: []byte(LeaderElection)}}},
-		{From: 1, To: 3, Term: 2, Type: pb.MsgVote, Entries: []pb.Entry{{Data: []byte(LeaderElection)}}},
+		{From: 1, To: 2, Term: 2, Type: pb.MsgVote},
+		{From: 1, To: 3, Term: 2, Type: pb.MsgVote},
 	}
 	if !reflect.DeepEqual(msgs, wmsgs) {
 		t.Errorf("msgs = %v, want %v", msgs, wmsgs)
diff --git a/raft/raft_test.go b/raft/raft_test.go
index 791d6ab8e..b2e16b339 100644
--- a/raft/raft_test.go
+++ b/raft/raft_test.go
@@ -2217,6 +2217,7 @@ func TestLeaderTransferWithCheckQuorum(t *testing.T) {
 		r.checkQuorum = true
 	}
 
+	// Letting peer 2 electionElapsed reach to timeout so that it can vote for peer 1
 	f := nt.peers[2].(*raft)
 	for i := 0; i < f.electionTimeout; i++ {
 		f.tick()