X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FSnapshotManager.java;h=9bbe285c29e863c885c88933c7f82fd7d739a704;hb=6065ba82c90e366919a1b78105507b935b91af8e;hp=432d678491e96a5509502265014ea755bc7e8eee;hpb=e6e3ad00c95d72f731142e649f198c5ded9dde64;p=controller.git 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 432d678491..9bbe285c29 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 @@ -10,8 +10,9 @@ package org.opendaylight.controller.cluster.raft; import akka.japi.Procedure; import akka.persistence.SnapshotSelectionCriteria; +import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.ByteString; -import org.opendaylight.controller.cluster.DataPersistenceProvider; +import java.util.List; import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshot; import org.opendaylight.controller.cluster.raft.base.messages.SendInstallSnapshot; import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior; @@ -19,9 +20,7 @@ import org.slf4j.Logger; public class SnapshotManager implements SnapshotState { - private final SnapshotState IDLE = new Idle(); - private final SnapshotState CAPTURING = new Capturing(); private final SnapshotState PERSISTING = new Persisting(); private final SnapshotState CREATING = new Creating(); @@ -35,6 +34,9 @@ public class SnapshotManager implements SnapshotState { private SnapshotState currentState = IDLE; private CaptureSnapshot captureSnapshot; + private long lastSequenceNumber = -1; + + private Procedure createSnapshotProcedure; public SnapshotManager(RaftActorContext context, Logger logger) { this.context = context; @@ -57,19 +59,13 @@ public class SnapshotManager implements SnapshotState { } @Override - public void create(Procedure callback) { - currentState.create(callback); - } - - @Override - public void persist(DataPersistenceProvider persistenceProvider, byte[] snapshotBytes, - RaftActorBehavior currentBehavior, long totalMemory) { - currentState.persist(persistenceProvider, snapshotBytes, currentBehavior, totalMemory); + public void persist(byte[] snapshotBytes, RaftActorBehavior currentBehavior, long totalMemory) { + currentState.persist(snapshotBytes, currentBehavior, totalMemory); } @Override - public void commit(DataPersistenceProvider persistenceProvider, long sequenceNumber) { - currentState.commit(persistenceProvider, sequenceNumber); + public void commit(long sequenceNumber) { + currentState.commit(sequenceNumber); } @Override @@ -82,6 +78,19 @@ public class SnapshotManager implements SnapshotState { return currentState.trimLog(desiredTrimIndex, currentBehavior); } + public void setCreateSnapshotCallable(Procedure createSnapshotProcedure) { + this.createSnapshotProcedure = createSnapshotProcedure; + } + + public long getLastSequenceNumber() { + return lastSequenceNumber; + } + + @VisibleForTesting + public CaptureSnapshot getCaptureSnapshot() { + return captureSnapshot; + } + private boolean hasFollowers(){ return context.getPeerAddresses().keySet().size() > 0; } @@ -110,18 +119,12 @@ public class SnapshotManager implements SnapshotState { } @Override - public void create(Procedure callback) { - LOG.debug("create should not be called in state {}", this); - } - - @Override - public void persist(DataPersistenceProvider persistenceProvider, byte[] snapshotBytes, - RaftActorBehavior currentBehavior, long totalMemory) { + public void persist(byte[] snapshotBytes, RaftActorBehavior currentBehavior, long totalMemory) { LOG.debug("persist should not be called in state {}", this); } @Override - public void commit(DataPersistenceProvider persistenceProvider, long sequenceNumber) { + public void commit(long sequenceNumber) { LOG.debug("commit should not be called in state {}", this); } @@ -184,20 +187,33 @@ public class SnapshotManager implements SnapshotState { 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, targetFollower!=null); - - SnapshotManager.this.currentState = CAPTURING; + newReplicatedToAllIndex, newReplicatedToAllTerm, unAppliedEntries, targetFollower != null); - if(targetFollower != null){ - LOG.info("{}: Initiating snapshot capture {}", persistenceId(), captureSnapshot); - } else { + if(captureSnapshot.isInstallSnapshotInitiated()) { LOG.info("{}: Initiating snapshot capture {} to install on {}", persistenceId(), captureSnapshot, targetFollower); + } else { + LOG.info("{}: Initiating snapshot capture {}", persistenceId(), captureSnapshot); } - context.getActor().tell(captureSnapshot, context.getActor()); + lastSequenceNumber = context.getPersistenceProvider().getLastSequenceNumber(); + + LOG.debug("lastSequenceNumber prior to capture: {}", lastSequenceNumber); + + SnapshotManager.this.currentState = CREATING; + + try { + createSnapshotProcedure.apply(null); + } catch (Exception e) { + SnapshotManager.this.currentState = IDLE; + LOG.error("Error creating snapshot", e); + return false; + } return true; } @@ -223,30 +239,6 @@ public class SnapshotManager implements SnapshotState { } } - private class Capturing extends AbstractSnapshotState { - - @Override - public boolean isCapturing() { - return true; - } - - @Override - public void create(Procedure callback) { - try { - callback.apply(null); - SnapshotManager.this.currentState = CREATING; - } catch (Exception e) { - LOG.error("Unexpected error occurred", e); - } - } - - @Override - public String toString() { - return "Capturing"; - } - - } - private class Creating extends AbstractSnapshotState { @Override @@ -255,17 +247,16 @@ public class SnapshotManager implements SnapshotState { } @Override - public void persist(DataPersistenceProvider persistenceProvider, byte[] snapshotBytes, - RaftActorBehavior currentBehavior, long totalMemory) { + public void persist(byte[] snapshotBytes, RaftActorBehavior currentBehavior, long totalMemory) { // create a snapshot object from the state provided and save it // when snapshot is saved async, SaveSnapshotSuccess is raised. Snapshot sn = Snapshot.create(snapshotBytes, - context.getReplicatedLog().getFrom(captureSnapshot.getLastAppliedIndex() + 1), + captureSnapshot.getUnAppliedEntries(), captureSnapshot.getLastIndex(), captureSnapshot.getLastTerm(), captureSnapshot.getLastAppliedIndex(), captureSnapshot.getLastAppliedTerm()); - persistenceProvider.saveSnapshot(sn); + context.getPersistenceProvider().saveSnapshot(sn); LOG.info("{}: Persisting of snapshot done:{}", persistenceId(), sn.getLogMessage()); @@ -331,13 +322,15 @@ public class SnapshotManager implements SnapshotState { private class Persisting extends AbstractSnapshotState { @Override - public void commit(DataPersistenceProvider persistenceProvider, long sequenceNumber) { + public void commit(long sequenceNumber) { + LOG.debug("Snapshot success sequence number:", sequenceNumber); context.getReplicatedLog().snapshotCommit(); - persistenceProvider.deleteSnapshots(new SnapshotSelectionCriteria( + context.getPersistenceProvider().deleteSnapshots(new SnapshotSelectionCriteria( sequenceNumber - context.getConfigParams().getSnapshotBatchCount(), 43200000)); - persistenceProvider.deleteMessages(sequenceNumber); + context.getPersistenceProvider().deleteMessages(lastSequenceNumber); + lastSequenceNumber = -1; SnapshotManager.this.currentState = IDLE; } @@ -366,7 +359,7 @@ public class SnapshotManager implements SnapshotState { long getTerm(); } - private static class LastAppliedTermInformationReader implements TermInformationReader{ + static class LastAppliedTermInformationReader implements TermInformationReader{ private long index; private long term; @@ -377,6 +370,8 @@ public class SnapshotManager implements SnapshotState { this.term = -1L; if (!hasFollowers) { if(lastLogEntry != null) { + // since we have persisted the last-log-entry to persistent journal before the capture, + // we would want to snapshot from this entry. index = lastLogEntry.getIndex(); term = lastLogEntry.getTerm(); }