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%2FShardSnapshotCohort.java;h=e49aa1e4f37d484d25439fd009affdeeba3a3cd8;hp=30299c7bb236fc8c49c27517cd8a03b8a39dd727;hb=8ec73bf853a9b6708b455c0321a585992e02b125;hpb=13ad69bc47bd5fa3f1df973861a5250ded0f59a7;ds=sidebyside diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java index 30299c7bb2..e49aa1e4f3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java @@ -24,14 +24,12 @@ import org.slf4j.Logger; * @author Thomas Pantelis */ class ShardSnapshotCohort implements RaftActorSnapshotCohort { - - private static final YangInstanceIdentifier DATASTORE_ROOT = YangInstanceIdentifier.builder().build(); - - private int createSnapshotTransactionCounter; private final ShardTransactionActorFactory transactionActorFactory; private final ShardDataTree store; - private final Logger log; private final String logId; + private final Logger log; + + private int createSnapshotTransactionCounter; ShardSnapshotCohort(ShardTransactionActorFactory transactionActorFactory, ShardDataTree store, Logger log, String logId) { @@ -70,10 +68,10 @@ class ShardSnapshotCohort implements RaftActorSnapshotCohort { NormalizedNode node = SerializationUtils.deserializeNormalizedNode(snapshotBytes); // delete everything first - transaction.getSnapshot().delete(DATASTORE_ROOT); + transaction.getSnapshot().delete(YangInstanceIdentifier.EMPTY); // Add everything from the remote node back - transaction.getSnapshot().write(DATASTORE_ROOT, node); + transaction.getSnapshot().write(YangInstanceIdentifier.EMPTY, node); syncCommitTransaction(transaction); } catch (InterruptedException | ExecutionException e) { log.error("{}: An exception occurred when applying snapshot", logId, e);