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%2FSnapshotManager.java;h=10574e3a02cf881c689a88e6f81de0f021ffe70b;hp=970fb8fc717c2b6d918c2e815fb9ef2b323a39fb;hb=250f3f77c80284536cc32e96739f713d21844103;hpb=fed267bf1b8a9ea81d1ee7c9721962863b98e391 diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java index 970fb8fc71..10574e3a02 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java @@ -12,8 +12,10 @@ import akka.japi.Procedure; import akka.persistence.SnapshotSelectionCriteria; import com.google.common.annotations.VisibleForTesting; import java.util.List; +import org.opendaylight.controller.cluster.raft.base.messages.ApplySnapshot; import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshot; import org.opendaylight.controller.cluster.raft.base.messages.SendInstallSnapshot; +import org.opendaylight.controller.cluster.raft.base.messages.SnapshotComplete; import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior; import org.slf4j.Logger; @@ -37,7 +39,7 @@ public class SnapshotManager implements SnapshotState { private Procedure createSnapshotProcedure; - private Snapshot applySnapshot; + private ApplySnapshot applySnapshot; private Procedure applySnapshotProcedure; public SnapshotManager(RaftActorContext context, Logger logger) { @@ -45,6 +47,10 @@ public class SnapshotManager implements SnapshotState { this.LOG = logger; } + public boolean isApplying() { + return applySnapshot != null; + } + @Override public boolean isCapturing() { return currentState.isCapturing(); @@ -61,7 +67,7 @@ public class SnapshotManager implements SnapshotState { } @Override - public void apply(Snapshot snapshot) { + public void apply(ApplySnapshot snapshot) { currentState.apply(snapshot); } @@ -103,13 +109,44 @@ public class SnapshotManager implements SnapshotState { } private boolean hasFollowers(){ - return context.getPeerAddresses().keySet().size() > 0; + return context.hasFollowers(); } private String persistenceId(){ return context.getId(); } + public CaptureSnapshot newCaptureSnapshot(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex, + boolean installSnapshotInitiated) { + TermInformationReader lastAppliedTermInfoReader = + lastAppliedTermInformationReader.init(context.getReplicatedLog(), context.getLastApplied(), + lastLogEntry, hasFollowers()); + + long lastAppliedIndex = lastAppliedTermInfoReader.getIndex(); + long lastAppliedTerm = lastAppliedTermInfoReader.getTerm(); + + TermInformationReader replicatedToAllTermInfoReader = + replicatedToAllTermInformationReader.init(context.getReplicatedLog(), replicatedToAllIndex); + + long newReplicatedToAllIndex = replicatedToAllTermInfoReader.getIndex(); + long newReplicatedToAllTerm = replicatedToAllTermInfoReader.getTerm(); + + List unAppliedEntries = context.getReplicatedLog().getFrom(lastAppliedIndex + 1); + + long lastLogEntryIndex = lastAppliedIndex; + long lastLogEntryTerm = lastAppliedTerm; + if(lastLogEntry != null) { + lastLogEntryIndex = lastLogEntry.getIndex(); + lastLogEntryTerm = lastLogEntry.getTerm(); + } else { + LOG.debug("Capturing Snapshot : lastLogEntry is null. Using lastAppliedIndex {} and lastAppliedTerm {} instead.", + lastAppliedIndex, lastAppliedTerm); + } + + return new CaptureSnapshot(lastLogEntryIndex, lastLogEntryTerm, lastAppliedIndex, lastAppliedTerm, + newReplicatedToAllIndex, newReplicatedToAllTerm, unAppliedEntries, installSnapshotInitiated); + } + private class AbstractSnapshotState implements SnapshotState { @Override @@ -130,7 +167,7 @@ public class SnapshotManager implements SnapshotState { } @Override - public void apply(Snapshot snapshot) { + public void apply(ApplySnapshot snapshot) { LOG.debug("apply should not be called in state {}", this); } @@ -194,26 +231,7 @@ public class SnapshotManager implements SnapshotState { } private boolean capture(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex, String targetFollower) { - TermInformationReader lastAppliedTermInfoReader = - lastAppliedTermInformationReader.init(context.getReplicatedLog(), context.getLastApplied(), - lastLogEntry, hasFollowers()); - - long lastAppliedIndex = lastAppliedTermInfoReader.getIndex(); - long lastAppliedTerm = lastAppliedTermInfoReader.getTerm(); - - TermInformationReader replicatedToAllTermInfoReader = - replicatedToAllTermInformationReader.init(context.getReplicatedLog(), replicatedToAllIndex); - - long newReplicatedToAllIndex = replicatedToAllTermInfoReader.getIndex(); - long newReplicatedToAllTerm = replicatedToAllTermInfoReader.getTerm(); - - // send a CaptureSnapshot to self to make the expensive operation async. - - List unAppliedEntries = context.getReplicatedLog().getFrom(lastAppliedIndex + 1); - - captureSnapshot = new CaptureSnapshot(lastLogEntry.getIndex(), - lastLogEntry.getTerm(), lastAppliedIndex, lastAppliedTerm, - newReplicatedToAllIndex, newReplicatedToAllTerm, unAppliedEntries, targetFollower != null); + captureSnapshot = newCaptureSnapshot(lastLogEntry, replicatedToAllIndex, targetFollower != null); if(captureSnapshot.isInstallSnapshotInitiated()) { LOG.info("{}: Initiating snapshot capture {} to install on {}", @@ -250,14 +268,14 @@ public class SnapshotManager implements SnapshotState { } @Override - public void apply(Snapshot snapshot) { - applySnapshot = snapshot; + public void apply(ApplySnapshot applySnapshot) { + SnapshotManager.this.applySnapshot = applySnapshot; lastSequenceNumber = context.getPersistenceProvider().getLastSequenceNumber(); LOG.debug("lastSequenceNumber prior to persisting applied snapshot: {}", lastSequenceNumber); - context.getPersistenceProvider().saveSnapshot(snapshot); + context.getPersistenceProvider().saveSnapshot(applySnapshot.getSnapshot()); SnapshotManager.this.currentState = PERSISTING; } @@ -283,11 +301,13 @@ public class SnapshotManager implements SnapshotState { Snapshot snapshot = Snapshot.create(snapshotBytes, captureSnapshot.getUnAppliedEntries(), captureSnapshot.getLastIndex(), captureSnapshot.getLastTerm(), - captureSnapshot.getLastAppliedIndex(), captureSnapshot.getLastAppliedTerm()); + captureSnapshot.getLastAppliedIndex(), captureSnapshot.getLastAppliedTerm(), + context.getTermInformation().getCurrentTerm(), + context.getTermInformation().getVotedFor(), context.getPeerServerInfo()); context.getPersistenceProvider().saveSnapshot(snapshot); - LOG.info("{}: Persisting of snapshot done: {}", persistenceId(), snapshot.getLogMessage()); + LOG.info("{}: Persisting of snapshot done: {}", persistenceId(), snapshot); long dataThreshold = totalMemory * context.getConfigParams().getSnapshotDataThresholdPercentage() / 100; @@ -295,7 +315,7 @@ public class SnapshotManager implements SnapshotState { boolean logSizeExceededSnapshotBatchCount = context.getReplicatedLog().size() >= context.getConfigParams().getSnapshotBatchCount(); -LOG.debug("Log size: {}, getSnapshotBatchCount: {}",context.getReplicatedLog().size(),context.getConfigParams().getSnapshotBatchCount()); + if (dataSizeThresholdExceeded || logSizeExceededSnapshotBatchCount) { if(LOG.isDebugEnabled()) { if(dataSizeThresholdExceeded) { @@ -362,16 +382,23 @@ LOG.debug("Log size: {}, getSnapshotBatchCount: {}",context.getReplicatedLog().s @Override public void commit(long sequenceNumber, RaftActorBehavior currentBehavior) { - LOG.debug("Snapshot success sequence number:", sequenceNumber); + LOG.debug("Snapshot success sequence number: {}", sequenceNumber); if(applySnapshot != null) { try { - applySnapshotProcedure.apply(applySnapshot.getState()); + Snapshot snapshot = applySnapshot.getSnapshot(); //clears the followers log, sets the snapshot index to ensure adjusted-index works - context.setReplicatedLog(ReplicatedLogImpl.newInstance(applySnapshot, context, currentBehavior)); - context.setLastApplied(applySnapshot.getLastAppliedIndex()); - context.setCommitIndex(applySnapshot.getLastAppliedIndex()); + context.setReplicatedLog(ReplicatedLogImpl.newInstance(snapshot, context, currentBehavior)); + context.setLastApplied(snapshot.getLastAppliedIndex()); + context.setCommitIndex(snapshot.getLastAppliedIndex()); + context.getTermInformation().update(snapshot.getElectionTerm(), snapshot.getElectionVotedFor()); + + if(snapshot.getState().length > 0 ) { + applySnapshotProcedure.apply(snapshot.getState()); + } + + applySnapshot.getCallback().onSuccess(); } catch (Exception e) { LOG.error("Error applying snapshot", e); } @@ -384,9 +411,7 @@ LOG.debug("Log size: {}, getSnapshotBatchCount: {}",context.getReplicatedLog().s context.getPersistenceProvider().deleteMessages(lastSequenceNumber); - lastSequenceNumber = -1; - applySnapshot = null; - SnapshotManager.this.currentState = IDLE; + snapshotComplete(); } @Override @@ -400,11 +425,19 @@ LOG.debug("Log size: {}, getSnapshotBatchCount: {}",context.getReplicatedLog().s context.getReplicatedLog().getSnapshotIndex(), context.getReplicatedLog().getSnapshotTerm(), context.getReplicatedLog().size()); + } else { + applySnapshot.getCallback().onFailure(); } + snapshotComplete(); + } + + private void snapshotComplete() { lastSequenceNumber = -1; applySnapshot = null; SnapshotManager.this.currentState = IDLE; + + context.getActor().tell(SnapshotComplete.INSTANCE, context.getActor()); } @Override