X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2Fbehaviors%2FAbstractRaftActorBehavior.java;h=0210dc4b1d0ed703a7e76fb8651f97b908563629;hb=630cb61cc1e51a486785162995eab7b541fcf237;hp=5394d65e2a347d27b9a119207a211aa914e6c5cf;hpb=f7f6b1742311d27967f1740795a25772da74f2c8;p=controller.git diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java index 5394d65e2a..0210dc4b1d 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java @@ -54,13 +54,6 @@ public abstract class AbstractRaftActorBehavior implements RaftActorBehavior { */ private Cancellable electionCancel = null; - /** - * - */ - protected String leaderId = null; - - private short leaderPayloadVersion = -1; - private long replicatedToAllIndex = -1; private final String logName; @@ -95,7 +88,7 @@ public abstract class AbstractRaftActorBehavior implements RaftActorBehavior { return state; } - public String logName() { + protected final String logName() { return logName; } @@ -428,19 +421,6 @@ public abstract class AbstractRaftActorBehavior implements RaftActorBehavior { return this; } - @Override public String getLeaderId() { - return leaderId; - } - - @Override - public short getLeaderPayloadVersion() { - return leaderPayloadVersion; - } - - public void setLeaderPayloadVersion(short leaderPayloadVersion) { - this.leaderPayloadVersion = leaderPayloadVersion; - } - @Override public RaftActorBehavior switchBehavior(RaftActorBehavior behavior) { return internalSwitchBehavior(behavior); @@ -495,7 +475,7 @@ public abstract class AbstractRaftActorBehavior implements RaftActorBehavior { * @param snapshotCapturedIndex */ protected void performSnapshotWithoutCapture(final long snapshotCapturedIndex) { - long actualIndex = context.getSnapshotManager().trimLog(snapshotCapturedIndex, this); + long actualIndex = context.getSnapshotManager().trimLog(snapshotCapturedIndex); if(actualIndex != -1){ setReplicatedToAllIndex(actualIndex);