X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FElectionTermImpl.java;h=e123a64874e84b925fa456f145b28ab508b547ff;hp=a22e57b32a83e6c52cd88341548704e950cb834d;hb=refs%2Fchanges%2F09%2F83009%2F6;hpb=04466bdc43349f1819cf9c42a1c74500e3e12ef1 diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ElectionTermImpl.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ElectionTermImpl.java index a22e57b32a..e123a64874 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ElectionTermImpl.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ElectionTermImpl.java @@ -8,16 +8,13 @@ package org.opendaylight.controller.cluster.raft; import org.opendaylight.controller.cluster.DataPersistenceProvider; -import org.opendaylight.controller.cluster.raft.RaftActor.UpdateElectionTerm; +import org.opendaylight.controller.cluster.raft.persisted.UpdateElectionTerm; import org.slf4j.Logger; /** * Implementation of ElectionTerm for the RaftActor. */ class ElectionTermImpl implements ElectionTerm { - /** - * Identifier of the actor whose election term information this is - */ private long currentTerm = 0; private String votedFor = null; @@ -42,18 +39,17 @@ class ElectionTermImpl implements ElectionTerm { return votedFor; } - @Override public void update(long currentTerm, String votedFor) { - if(log.isDebugEnabled()) { - log.debug("{}: Set currentTerm={}, votedFor={}", logId, currentTerm, votedFor); - } - this.currentTerm = currentTerm; - this.votedFor = votedFor; + @Override + public void update(long newTerm, String newVotedFor) { + log.debug("{}: Set currentTerm={}, votedFor={}", logId, newTerm, newVotedFor); + this.currentTerm = newTerm; + this.votedFor = newVotedFor; } @Override - public void updateAndPersist(long currentTerm, String votedFor){ - update(currentTerm, votedFor); + public void updateAndPersist(long newTerm, String newVotedFor) { + update(newTerm, newVotedFor); // FIXME : Maybe first persist then update the state persistence.persist(new UpdateElectionTerm(this.currentTerm, this.votedFor), NoopProcedure.instance()); } -} \ No newline at end of file +}