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=e6dc8bb367d6f0c27c49765e52e6dbdbcaa7de73;hp=79f2ce9b4ca0fb2b0deca496eed67e069bc1a547;hb=3859df9beca8f13f1ff2b2744ed3470a1715bec3;hpb=b0f8283587b5cc8573d29f66219cbe7f70e21e1b 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 79f2ce9b4c..e6dc8bb367 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 @@ -5,18 +5,25 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.cluster.raft; import akka.persistence.SnapshotSelectionCriteria; import com.google.common.annotations.VisibleForTesting; +import com.google.common.io.ByteSource; +import java.io.IOException; +import java.io.OutputStream; import java.util.List; +import java.util.Optional; import java.util.function.Consumer; +import org.eclipse.jdt.annotation.NonNull; +import org.opendaylight.controller.cluster.io.FileBackedOutputStream; 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.opendaylight.controller.cluster.raft.persisted.EmptyState; +import org.opendaylight.controller.cluster.raft.persisted.Snapshot; import org.slf4j.Logger; /** @@ -48,10 +55,10 @@ public class SnapshotManager implements SnapshotState { private CaptureSnapshot captureSnapshot; private long lastSequenceNumber = -1; - private Runnable createSnapshotProcedure; + private Consumer> createSnapshotProcedure = null; private ApplySnapshot applySnapshot; - private Consumer applySnapshotProcedure; + private RaftActorSnapshotCohort snapshotCohort = NoopRaftActorSnapshotCohort.INSTANCE; /** * Constructs an instance. @@ -59,7 +66,7 @@ public class SnapshotManager implements SnapshotState { * @param context the RaftActorContext * @param logger the Logger */ - public SnapshotManager(RaftActorContext context, Logger logger) { + public SnapshotManager(final RaftActorContext context, final Logger logger) { this.context = context; this.log = logger; } @@ -74,27 +81,29 @@ public class SnapshotManager implements SnapshotState { } @Override - public boolean captureToInstall(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex, String targetFollower) { + public boolean captureToInstall(final ReplicatedLogEntry lastLogEntry, final long replicatedToAllIndex, + final String targetFollower) { return currentState.captureToInstall(lastLogEntry, replicatedToAllIndex, targetFollower); } @Override - public boolean capture(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex) { + public boolean capture(final ReplicatedLogEntry lastLogEntry, final long replicatedToAllIndex) { return currentState.capture(lastLogEntry, replicatedToAllIndex); } @Override - public void apply(ApplySnapshot snapshot) { + public void apply(final ApplySnapshot snapshot) { currentState.apply(snapshot); } @Override - public void persist(final byte[] snapshotBytes, final long totalMemory) { - currentState.persist(snapshotBytes, totalMemory); + public void persist(final Snapshot.State state, final Optional installSnapshotStream, + final long totalMemory) { + currentState.persist(state, installSnapshotStream, totalMemory); } @Override - public void commit(final long sequenceNumber, long timeStamp) { + public void commit(final long sequenceNumber, final long timeStamp) { currentState.commit(sequenceNumber, timeStamp); } @@ -108,12 +117,17 @@ public class SnapshotManager implements SnapshotState { return currentState.trimLog(desiredTrimIndex); } - public void setCreateSnapshotRunnable(Runnable createSnapshotProcedure) { + @SuppressWarnings("checkstyle:hiddenField") + void setCreateSnapshotConsumer(final Consumer> createSnapshotProcedure) { this.createSnapshotProcedure = createSnapshotProcedure; } - public void setApplySnapshotConsumer(Consumer applySnapshotProcedure) { - this.applySnapshotProcedure = applySnapshotProcedure; + void setSnapshotCohort(final RaftActorSnapshotCohort snapshotCohort) { + this.snapshotCohort = snapshotCohort; + } + + public Snapshot.@NonNull State convertSnapshot(final ByteSource snapshotBytes) throws IOException { + return snapshotCohort.deserializeSnapshot(snapshotBytes); } public long getLastSequenceNumber() { @@ -138,11 +152,9 @@ public class SnapshotManager implements SnapshotState { * * @param lastLogEntry the last log entry for the snapshot. * @param replicatedToAllIndex the index of the last entry replicated to all followers. - * @param installSnapshotInitiated true if snapshot is initiated to install on a follower. * @return a new CaptureSnapshot instance. */ - public CaptureSnapshot newCaptureSnapshot(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex, - boolean installSnapshotInitiated) { + public CaptureSnapshot newCaptureSnapshot(final ReplicatedLogEntry lastLogEntry, final long replicatedToAllIndex) { TermInformationReader lastAppliedTermInfoReader = lastAppliedTermInformationReader.init(context.getReplicatedLog(), context.getLastApplied(), lastLogEntry, hasFollowers()); @@ -169,7 +181,7 @@ public class SnapshotManager implements SnapshotState { } return new CaptureSnapshot(lastLogEntryIndex, lastLogEntryTerm, lastAppliedIndex, lastAppliedTerm, - newReplicatedToAllIndex, newReplicatedToAllTerm, unAppliedEntries, installSnapshotInitiated); + newReplicatedToAllIndex, newReplicatedToAllTerm, unAppliedEntries); } private class AbstractSnapshotState implements SnapshotState { @@ -180,30 +192,31 @@ public class SnapshotManager implements SnapshotState { } @Override - public boolean capture(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex) { + public boolean capture(final ReplicatedLogEntry lastLogEntry, final long replicatedToAllIndex) { log.debug("capture should not be called in state {}", this); return false; } @Override - public boolean captureToInstall(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex, - String targetFollower) { + public boolean captureToInstall(final ReplicatedLogEntry lastLogEntry, final long replicatedToAllIndex, + final String targetFollower) { log.debug("captureToInstall should not be called in state {}", this); return false; } @Override - public void apply(ApplySnapshot snapshot) { + public void apply(final ApplySnapshot snapshot) { log.debug("apply should not be called in state {}", this); } @Override - public void persist(final byte[] snapshotBytes, final long totalMemory) { + public void persist(final Snapshot.State state, final Optional installSnapshotStream, + final long totalMemory) { log.debug("persist should not be called in state {}", this); } @Override - public void commit(final long sequenceNumber, long timeStamp) { + public void commit(final long sequenceNumber, final long timeStamp) { log.debug("commit should not be called in state {}", this); } @@ -260,10 +273,13 @@ public class SnapshotManager implements SnapshotState { } @SuppressWarnings("checkstyle:IllegalCatch") - private boolean capture(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex, String targetFollower) { - captureSnapshot = newCaptureSnapshot(lastLogEntry, replicatedToAllIndex, targetFollower != null); + private boolean capture(final ReplicatedLogEntry lastLogEntry, final long replicatedToAllIndex, + final String targetFollower) { + captureSnapshot = newCaptureSnapshot(lastLogEntry, replicatedToAllIndex); - if (captureSnapshot.isInstallSnapshotInitiated()) { + OutputStream installSnapshotStream = null; + if (targetFollower != null) { + installSnapshotStream = context.getFileBackedOutputStreamFactory().newInstance(); log.info("{}: Initiating snapshot capture {} to install on {}", persistenceId(), captureSnapshot, targetFollower); } else { @@ -277,7 +293,7 @@ public class SnapshotManager implements SnapshotState { SnapshotManager.this.currentState = CREATING; try { - createSnapshotProcedure.run(); + createSnapshotProcedure.accept(Optional.ofNullable(installSnapshotStream)); } catch (Exception e) { SnapshotManager.this.currentState = IDLE; log.error("Error creating snapshot", e); @@ -288,18 +304,18 @@ public class SnapshotManager implements SnapshotState { } @Override - public boolean capture(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex) { + public boolean capture(final ReplicatedLogEntry lastLogEntry, final long replicatedToAllIndex) { return capture(lastLogEntry, replicatedToAllIndex, null); } @Override - public boolean captureToInstall(ReplicatedLogEntry lastLogEntry, long replicatedToAllIndex, - String targetFollower) { + public boolean captureToInstall(final ReplicatedLogEntry lastLogEntry, final long replicatedToAllIndex, + final String targetFollower) { return capture(lastLogEntry, replicatedToAllIndex, targetFollower); } @Override - public void apply(ApplySnapshot toApply) { + public void apply(final ApplySnapshot toApply) { SnapshotManager.this.applySnapshot = toApply; lastSequenceNumber = context.getPersistenceProvider().getLastSequenceNumber(); @@ -325,11 +341,12 @@ public class SnapshotManager implements SnapshotState { private class Creating extends AbstractSnapshotState { @Override - public void persist(final byte[] snapshotBytes, final long totalMemory) { + public void persist(final Snapshot.State snapshotState, final Optional installSnapshotStream, + final long totalMemory) { // create a snapshot object from the state provided and save it // when snapshot is saved async, SaveSnapshotSuccess is raised. - Snapshot snapshot = Snapshot.create(snapshotBytes, + Snapshot snapshot = Snapshot.create(snapshotState, captureSnapshot.getUnAppliedEntries(), captureSnapshot.getLastIndex(), captureSnapshot.getLastTerm(), captureSnapshot.getLastAppliedIndex(), captureSnapshot.getLastAppliedTerm(), @@ -393,10 +410,19 @@ public class SnapshotManager implements SnapshotState { context.getId(), context.getReplicatedLog().getSnapshotIndex(), context.getReplicatedLog().getSnapshotTerm()); - if (context.getId().equals(currentBehavior.getLeaderId()) - && captureSnapshot.isInstallSnapshotInitiated()) { - // this would be call straight to the leader and won't initiate in serialization - currentBehavior.handleMessage(context.getActor(), new SendInstallSnapshot(snapshot)); + if (installSnapshotStream.isPresent()) { + if (context.getId().equals(currentBehavior.getLeaderId())) { + try { + ByteSource snapshotBytes = ((FileBackedOutputStream)installSnapshotStream.get()).asByteSource(); + currentBehavior.handleMessage(context.getActor(), + new SendInstallSnapshot(snapshot, snapshotBytes)); + } catch (IOException e) { + log.error("{}: Snapshot install failed due to an unrecoverable streaming error", + context.getId(), e); + } + } else { + ((FileBackedOutputStream)installSnapshotStream.get()).cleanup(); + } } captureSnapshot = null; @@ -414,7 +440,7 @@ public class SnapshotManager implements SnapshotState { @Override @SuppressWarnings("checkstyle:IllegalCatch") - public void commit(final long sequenceNumber, long timeStamp) { + public void commit(final long sequenceNumber, final long timeStamp) { log.debug("{}: Snapshot success - sequence number: {}", persistenceId(), sequenceNumber); if (applySnapshot != null) { @@ -431,8 +457,8 @@ public class SnapshotManager implements SnapshotState { context.updatePeerIds(snapshot.getServerConfiguration()); } - if (snapshot.getState().length > 0 ) { - applySnapshotProcedure.accept(snapshot.getState()); + if (!(snapshot.getState() instanceof EmptyState)) { + snapshotCohort.applySnapshot(snapshot.getState()); } applySnapshot.getCallback().onSuccess(); @@ -443,7 +469,7 @@ public class SnapshotManager implements SnapshotState { context.getReplicatedLog().snapshotCommit(); } - context.getPersistenceProvider().deleteSnapshots(new SnapshotSelectionCriteria(sequenceNumber, + context.getPersistenceProvider().deleteSnapshots(new SnapshotSelectionCriteria(scala.Long.MaxValue(), timeStamp - 1, 0L, 0L)); context.getPersistenceProvider().deleteMessages(lastSequenceNumber); @@ -494,8 +520,8 @@ public class SnapshotManager implements SnapshotState { private long index; private long term; - LastAppliedTermInformationReader init(ReplicatedLog log, long originalIndex, ReplicatedLogEntry lastLogEntry, - boolean hasFollowers) { + LastAppliedTermInformationReader init(final ReplicatedLog log, final long originalIndex, + final ReplicatedLogEntry lastLogEntry, final boolean hasFollowers) { ReplicatedLogEntry entry = log.get(originalIndex); this.index = -1L; this.term = -1L; @@ -531,7 +557,7 @@ public class SnapshotManager implements SnapshotState { private long index; private long term; - ReplicatedToAllTermInformationReader init(ReplicatedLog log, long originalIndex) { + ReplicatedToAllTermInformationReader init(final ReplicatedLog log, final long originalIndex) { ReplicatedLogEntry entry = log.get(originalIndex); this.index = -1L; this.term = -1L;