X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardRecoveryCoordinator.java;h=7ece110d0143c4e1261ba511a9f73f0dbb8b3905;hp=797641978d2cd47cc7eed57c12e77e2334cb943c;hb=634dfac8eead60f443bf75e749c70d1f2bb29198;hpb=2727bea09c83646b6cbd2ef9672d0b7f6cf3b22f diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java index 797641978d..7ece110d01 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java @@ -7,20 +7,15 @@ */ package org.opendaylight.controller.cluster.datastore; -import java.io.IOException; -import org.opendaylight.controller.cluster.datastore.modification.ModificationPayload; -import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; -import org.opendaylight.controller.cluster.datastore.utils.SerializationUtils; +import com.google.common.base.Preconditions; +import java.io.File; +import org.opendaylight.controller.cluster.datastore.persisted.ShardDataTreeSnapshot; +import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState; +import org.opendaylight.controller.cluster.datastore.utils.NormalizedNodeXMLOutput; import org.opendaylight.controller.cluster.raft.RaftActorRecoveryCohort; -import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationByteStringPayload; -import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationPayload; +import org.opendaylight.controller.cluster.raft.persisted.Snapshot; import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidates; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; import org.slf4j.Logger; /** @@ -32,89 +27,111 @@ import org.slf4j.Logger; * * @author Thomas Pantelis */ -class ShardRecoveryCoordinator implements RaftActorRecoveryCohort { - private static final YangInstanceIdentifier ROOT = YangInstanceIdentifier.builder().build(); - private final DataTree store; +abstract class ShardRecoveryCoordinator implements RaftActorRecoveryCohort { + private static final class Simple extends ShardRecoveryCoordinator { + Simple(final ShardDataTree store, final String shardName, final Logger log) { + super(store, shardName, log); + } + + @Override + public Snapshot getRestoreFromSnapshot() { + return null; + } + } + + private static final class WithSnapshot extends ShardRecoveryCoordinator { + private final Snapshot restoreFromSnapshot; + + WithSnapshot(final ShardDataTree store, final String shardName, final Logger log, final Snapshot snapshot) { + super(store, shardName, log); + this.restoreFromSnapshot = Preconditions.checkNotNull(snapshot); + } + + @Override + public Snapshot getRestoreFromSnapshot() { + return restoreFromSnapshot; + } + } + + private final ShardDataTree store; private final String shardName; private final Logger log; - private DataTreeModification transaction; - private int size; - ShardRecoveryCoordinator(ShardDataTree store, String shardName, Logger log) { - this.store = store.getDataTree(); - this.shardName = shardName; - this.log = log; + private boolean open; + + ShardRecoveryCoordinator(final ShardDataTree store, final String shardName, final Logger log) { + this.store = Preconditions.checkNotNull(store); + this.shardName = Preconditions.checkNotNull(shardName); + this.log = Preconditions.checkNotNull(log); + } + + static ShardRecoveryCoordinator create(final ShardDataTree store, final String shardName, final Logger log) { + return new Simple(store, shardName, log); + } + + static ShardRecoveryCoordinator forSnapshot(final ShardDataTree store, final String shardName, final Logger log, + final Snapshot snapshot) { + return new WithSnapshot(store, shardName, log, snapshot); } @Override - public void startLogRecoveryBatch(int maxBatchSize) { + public void startLogRecoveryBatch(final int maxBatchSize) { log.debug("{}: starting log recovery batch with max size {}", shardName, maxBatchSize); - transaction = store.takeSnapshot().newModification(); - size = 0; + open = true; } @Override - public void appendRecoveredLogEntry(Payload payload) { + @SuppressWarnings("checkstyle:IllegalCatch") + public void appendRecoveredLogEntry(final Payload payload) { + Preconditions.checkState(open, "call startLogRecovery before calling appendRecoveredLogEntry"); + try { - if (payload instanceof DataTreeCandidatePayload) { - DataTreeCandidates.applyToModification(transaction, ((DataTreeCandidatePayload)payload).getCandidate()); - size++; - } else if (payload instanceof ModificationPayload) { - MutableCompositeModification.fromSerializable( - ((ModificationPayload) payload).getModification()).apply(transaction); - size++; - } else if (payload instanceof CompositeModificationPayload) { - MutableCompositeModification.fromSerializable( - ((CompositeModificationPayload) payload).getModification()).apply(transaction); - size++; - } else if (payload instanceof CompositeModificationByteStringPayload) { - MutableCompositeModification.fromSerializable( - ((CompositeModificationByteStringPayload) payload).getModification()).apply(transaction); - size++; - } else { - log.error("{}: Unknown payload {} received during recovery", shardName, payload); - } - } catch (IOException | ClassNotFoundException e) { - log.error("{}: Error extracting ModificationPayload", shardName, e); + store.applyRecoveryPayload(payload); + } catch (Exception e) { + log.error("{}: failed to apply payload {}", shardName, payload, e); + throw new IllegalStateException(String.format("%s: Failed to apply recovery payload %s", + shardName, payload), e); } } - private void commitTransaction(DataTreeModification tx) throws DataValidationFailedException { - tx.ready(); - store.validate(tx); - store.commit(store.prepare(tx)); - } - /** * Applies the current batched log entries to the data store. */ @Override public void applyCurrentLogRecoveryBatch() { - log.debug("{}: Applying current log recovery batch with size {}", shardName, size); - try { - commitTransaction(transaction); - } catch (DataValidationFailedException e) { - log.error("{}: Failed to apply recovery batch", shardName, e); - } - transaction = null; + Preconditions.checkState(open, "call startLogRecovery before calling applyCurrentLogRecoveryBatch"); + open = false; + } + + private File writeRoot(final String kind, final NormalizedNode node) { + final File file = new File(System.getProperty("karaf.data", "."), + "failed-recovery-" + kind + "-" + shardName + ".xml"); + NormalizedNodeXMLOutput.toFile(file, node); + return file; } /** * Applies a recovered snapshot to the data store. * - * @param snapshotBytes the serialized snapshot + * @param snapshotState the serialized snapshot */ @Override - public void applyRecoverySnapshot(final byte[] snapshotBytes) { + @SuppressWarnings("checkstyle:IllegalCatch") + public void applyRecoverySnapshot(final Snapshot.State snapshotState) { + if (!(snapshotState instanceof ShardSnapshotState)) { + log.debug("{}: applyRecoverySnapshot ignoring snapshot: {}", shardName, snapshotState); + } + log.debug("{}: Applying recovered snapshot", shardName); - final NormalizedNode node = SerializationUtils.deserializeNormalizedNode(snapshotBytes); - final DataTreeModification tx = store.takeSnapshot().newModification(); - tx.write(ROOT, node); + ShardDataTreeSnapshot shardSnapshot = ((ShardSnapshotState)snapshotState).getSnapshot(); try { - commitTransaction(tx); - } catch (DataValidationFailedException e) { - log.error("{}: Failed to apply recovery snapshot", shardName, e); + store.applyRecoverySnapshot(shardSnapshot); + } catch (Exception e) { + final File f = writeRoot("snapshot", shardSnapshot.getRootNode().orElse(null)); + throw new IllegalStateException(String.format( + "%s: Failed to apply recovery snapshot %s. Node data was written to file %s", + shardName, shardSnapshot, f), e); } } }