Raft 45

src/main/scala/pl/project13/scala/akka/raft/Candidate.scala

@@ -28,7 +28,7 @@ private[raft] trait Candidate {
         val request = RequestVote(m.currentTerm, m.clusterSelf, replicatedLog.lastTerm, replicatedLog.lastIndex)
         m.membersExceptSelf foreach { _ ! request }
 
-        val includingThisVote = m.incVote
+        val includingThisVote = m.incVote(self)
         stay() using includingThisVote.withVoteFor(m.currentTerm, m.clusterSelf)
       }
 
@@ -62,7 +62,7 @@ private[raft] trait Candidate {
       goto(Follower) using m.forFollower(term)
 
     case Event(VoteCandidate(term), m: ElectionMeta) =>
-      val includingThisVote = m.incVote
+      val includingThisVote = m.incVote(voter())
 
       if (includingThisVote.hasMajority) {
         log.info("Received vote by {}. Won election with {} of {} votes", voter(), includingThisVote.votesReceived, m.config.members.size)

src/main/scala/pl/project13/scala/akka/raft/protocol/StateMetadata.scala

@@ -45,7 +45,7 @@ private[protocol] trait StateMetadata extends Serializable {
   ) extends Metadata {
 
     // transition helpers
-    def forNewElection: ElectionMeta = ElectionMeta(clusterSelf, currentTerm.next, 0, config, votes)
+    def forNewElection: ElectionMeta = ElectionMeta(clusterSelf, currentTerm.next, Set.empty, config, votes)
 
     def withVote(term: Term, candidate: ActorRef) = {
       if (term > currentTerm)
@@ -66,15 +66,16 @@ private[protocol] trait StateMetadata extends Serializable {
   case class ElectionMeta(
     clusterSelf: ActorRef,
     currentTerm: Term,
-    votesReceived: Int,
+    votesReceived: Set[String],
     config: ClusterConfiguration,
     votes: Map[Term, Candidate]
   ) extends Metadata {
 
-    def hasMajority = votesReceived > config.members.size / 2
+    def hasMajority = votesReceived.size > config.members.size / 2
 
     // transistion helpers
-    def incVote = copy(votesReceived = votesReceived + 1)
+    def incVote(voter: Candidate) = copy(
+      votesReceived = votesReceived + voter.path.name)
     def incTerm = copy(currentTerm = currentTerm.next)
 
     def withVoteFor(term: Term, candidate: ActorRef) = copy(votes = votes + (term -> candidate))