Simplify isolated leader check

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / main / java / org / opendaylight / controller / cluster / raft / ElectionTerm.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ElectionTerm.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ElectionTerm.java
index 2cf39b59f19e81fcfeeb7bcec83c020e848acd27..9f0d02edb9d5aa111b841f0972c0d82ca07a7df8 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ElectionTerm.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ElectionTerm.java
@@ -8,8 +8,6 @@
 
 package org.opendaylight.controller.cluster.raft;
 
-import java.util.concurrent.atomic.AtomicLong;
-
 /**
  * ElectionTerm contains information about a RaftActors election term.
  * <p>
@@ -23,7 +21,7 @@ public interface ElectionTerm {
      * latest term server has seen (initialized to 0
      * on first boot, increases monotonically)
      */
-    AtomicLong getCurrentTerm();
+    long getCurrentTerm();
 
     /**
      * candidateId that received vote in current
@@ -32,12 +30,25 @@ public interface ElectionTerm {
     String getVotedFor();
 
     /**
-     * Called when we need to update the current term either because we received
-     * a message from someone with a more uptodate term or because we just voted
-     * for someone
+     * To be called mainly when we are recovering in-memory election state from
+     * persistent storage
+     *
+     * @param currentTerm
+     * @param votedFor
+     */
+    void update(long currentTerm, String votedFor);
+
+    /**
+     * To be called when we need to update the current term either because we
+     * received a message from someone with a more up-to-date term or because we
+     * just voted for someone
+     * <p>
+     * This information needs to be persisted so that on recovery the replica
+     * can start itself in the right term and know if it has already voted in
+     * that term or not
      *
      * @param currentTerm
      * @param votedFor
      */
-    void update(AtomicLong currentTerm, String votedFor);
+    void updateAndPersist(long currentTerm, String votedFor);
 }