Use YangInstanceIdentifier.EMPTY
[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / DistributedDataStoreIntegrationTest.java
index fdc7e664c2b6cd63b5071e504bebf70c5f0dc05d..f00472c4ec186105c0dddadbc9b22c087e6fa209 100644 (file)
@@ -1,35 +1,73 @@
+/*
+ * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.datastore;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import akka.actor.ActorRef;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
 import akka.actor.ActorSystem;
-import akka.actor.PoisonPill;
+import akka.actor.Address;
+import akka.actor.AddressFromURIString;
+import akka.cluster.Cluster;
+import akka.testkit.JavaTestKit;
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Uninterruptibles;
+import com.typesafe.config.ConfigFactory;
+import java.io.IOException;
+import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
-import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.mockito.Mockito;
+import org.opendaylight.controller.cluster.databroker.ConcurrentDOMDataBroker;
 import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;
 import org.opendaylight.controller.cluster.datastore.exceptions.NotInitializedException;
-import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory;
-import org.opendaylight.controller.cluster.datastore.utils.MockClusterWrapper;
+import org.opendaylight.controller.cluster.datastore.messages.DatastoreSnapshot;
+import org.opendaylight.controller.cluster.datastore.messages.FindLocalShard;
+import org.opendaylight.controller.cluster.datastore.messages.LocalShardFound;
 import org.opendaylight.controller.cluster.datastore.utils.MockDataChangeListener;
+import org.opendaylight.controller.cluster.datastore.utils.SerializationUtils;
+import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
+import org.opendaylight.controller.cluster.raft.Snapshot;
 import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal;
 import org.opendaylight.controller.md.cluster.datastore.model.CarsModel;
 import org.opendaylight.controller.md.cluster.datastore.model.PeopleModel;
 import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper;
 import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainClosedException;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
+import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
+import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
+import org.opendaylight.controller.sal.core.spi.data.DOMStore;
 import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
 import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction;
 import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
@@ -37,119 +75,237 @@ import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain;
 import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder;
+
+public class DistributedDataStoreIntegrationTest {
 
-public class DistributedDataStoreIntegrationTest extends AbstractActorTest {
+    private static ActorSystem system;
 
     private final DatastoreContext.Builder datastoreContextBuilder =
             DatastoreContext.newBuilder().shardHeartbeatIntervalInMillis(100);
 
+    @BeforeClass
+    public static void setUpClass() throws IOException {
+        system = ActorSystem.create("cluster-test", ConfigFactory.load().getConfig("Member1"));
+        Address member1Address = AddressFromURIString.parse("akka.tcp://cluster-test@127.0.0.1:2558");
+        Cluster.get(system).join(member1Address);
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws IOException {
+        JavaTestKit.shutdownActorSystem(system);
+        system = null;
+    }
+
+    protected ActorSystem getSystem() {
+        return system;
+    }
+
     @Test
     public void testWriteTransactionWithSingleShard() throws Exception{
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore =
-                    setupDistributedDataStore("transactionIntegrationTest", "test-1");
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore =
+                    setupDistributedDataStore("transactionIntegrationTest", "test-1")) {
 
-            testWriteTransaction(dataStore, TestModel.TEST_PATH,
+                testWriteTransaction(dataStore, TestModel.TEST_PATH,
                     ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-            testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH,
+                testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH,
                     ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
-
-            cleanup(dataStore);
+            }
         }};
     }
 
     @Test
     public void testWriteTransactionWithMultipleShards() throws Exception{
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore =
-                    setupDistributedDataStore("testWriteTransactionWithMultipleShards", "cars-1", "people-1");
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore =
+                    setupDistributedDataStore("testWriteTransactionWithMultipleShards", "cars-1", "people-1")) {
+
+                DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
+                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+
+                writeTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                writeTx.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
+
+                doCommit(writeTx.ready());
 
-            DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
-            assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+                writeTx = dataStore.newWriteOnlyTransaction();
 
-            YangInstanceIdentifier nodePath1 = CarsModel.BASE_PATH;
-            NormalizedNode<?, ?> nodeToWrite1 = CarsModel.emptyContainer();
-            writeTx.write(nodePath1, nodeToWrite1);
+                writeTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                writeTx.write(PeopleModel.PERSON_LIST_PATH, PeopleModel.newPersonMapNode());
 
-            YangInstanceIdentifier nodePath2 = PeopleModel.BASE_PATH;
-            NormalizedNode<?, ?> nodeToWrite2 = PeopleModel.emptyContainer();
-            writeTx.write(nodePath2, nodeToWrite2);
+                doCommit(writeTx.ready());
 
-            DOMStoreThreePhaseCommitCohort cohort = writeTx.ready();
+                writeTx = dataStore.newWriteOnlyTransaction();
 
-            doCommit(cohort);
+                MapEntryNode car = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000));
+                YangInstanceIdentifier carPath = CarsModel.newCarPath("optima");
+                writeTx.write(carPath, car);
 
-            // Verify the data in the store
+                MapEntryNode person = PeopleModel.newPersonEntry("jack");
+                YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack");
+                writeTx.write(personPath, person);
 
-            DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                doCommit(writeTx.ready());
 
-            Optional<NormalizedNode<?, ?>> optional = readTx.read(nodePath1).get();
-            assertEquals("isPresent", true, optional.isPresent());
-            assertEquals("Data node", nodeToWrite1, optional.get());
+                // Verify the data in the store
 
-            optional = readTx.read(nodePath2).get();
-            assertEquals("isPresent", true, optional.isPresent());
-            assertEquals("Data node", nodeToWrite2, optional.get());
+                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
 
-            cleanup(dataStore);
+                Optional<NormalizedNode<?, ?>> optional = readTx.read(carPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", car, optional.get());
+
+                optional = readTx.read(personPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", person, optional.get());
+            }
         }};
     }
 
     @Test
-    public void testReadWriteTransaction() throws Exception{
+    public void testReadWriteTransactionWithSingleShard() throws Exception{
         System.setProperty("shard.persistent", "true");
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore =
-                    setupDistributedDataStore("testReadWriteTransaction", "test-1");
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore =
+                    setupDistributedDataStore("testReadWriteTransactionWithSingleShard", "test-1")) {
+
+                // 1. Create a read-write Tx
+
+                DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
+                assertNotNull("newReadWriteTransaction returned null", readWriteTx);
+
+                // 2. Write some data
+
+                YangInstanceIdentifier nodePath = TestModel.TEST_PATH;
+                NormalizedNode<?, ?> nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
+                readWriteTx.write(nodePath, nodeToWrite );
 
-            // 1. Create a read-write Tx
+                // 3. Read the data from Tx
 
-            DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
-            assertNotNull("newReadWriteTransaction returned null", readWriteTx);
+                Boolean exists = readWriteTx.exists(nodePath).checkedGet(5, TimeUnit.SECONDS);
+                assertEquals("exists", true, exists);
 
-            // 2. Write some data
+                Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(nodePath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", nodeToWrite, optional.get());
 
-            YangInstanceIdentifier nodePath = TestModel.TEST_PATH;
-            NormalizedNode<?, ?> nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
-            readWriteTx.write(nodePath, nodeToWrite );
+                // 4. Ready the Tx for commit
 
-            // 3. Read the data from Tx
+                DOMStoreThreePhaseCommitCohort cohort = readWriteTx.ready();
 
-            Boolean exists = readWriteTx.exists(nodePath).checkedGet(5, TimeUnit.SECONDS);
-            assertEquals("exists", true, exists);
+                // 5. Commit the Tx
 
-            Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(nodePath).get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", true, optional.isPresent());
-            assertEquals("Data node", nodeToWrite, optional.get());
+                doCommit(cohort);
+
+                // 6. Verify the data in the store
 
-            // 4. Ready the Tx for commit
+                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
 
-            DOMStoreThreePhaseCommitCohort cohort = readWriteTx.ready();
+                optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", nodeToWrite, optional.get());
+            }
+        }};
+    }
 
-            // 5. Commit the Tx
+    @Test
+    public void testReadWriteTransactionWithMultipleShards() throws Exception{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore =
+                    setupDistributedDataStore("testReadWriteTransactionWithMultipleShards", "cars-1", "people-1")) {
 
-            doCommit(cohort);
+                DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
+                assertNotNull("newReadWriteTransaction returned null", readWriteTx);
 
-            // 6. Verify the data in the store
+                readWriteTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                readWriteTx.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
 
-            DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                doCommit(readWriteTx.ready());
 
-            optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", true, optional.isPresent());
-            assertEquals("Data node", nodeToWrite, optional.get());
+                readWriteTx = dataStore.newReadWriteTransaction();
 
-            cleanup(dataStore);
+                readWriteTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                readWriteTx.write(PeopleModel.PERSON_LIST_PATH, PeopleModel.newPersonMapNode());
+
+                doCommit(readWriteTx.ready());
+
+                readWriteTx = dataStore.newReadWriteTransaction();
+
+                MapEntryNode car = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000));
+                YangInstanceIdentifier carPath = CarsModel.newCarPath("optima");
+                readWriteTx.write(carPath, car);
+
+                MapEntryNode person = PeopleModel.newPersonEntry("jack");
+                YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack");
+                readWriteTx.write(personPath, person);
+
+                Boolean exists = readWriteTx.exists(carPath).checkedGet(5, TimeUnit.SECONDS);
+                assertEquals("exists", true, exists);
+
+                Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", car, optional.get());
+
+                doCommit(readWriteTx.ready());
+
+                // Verify the data in the store
+
+                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+
+                optional = readTx.read(carPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", car, optional.get());
+
+                optional = readTx.read(personPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", person, optional.get());
+
+            }
         }};
     }
 
-    private void testTransactionWritesWithShardNotInitiallyReady(final boolean writeOnly) throws Exception {
-        new IntegrationTestKit(getSystem()) {{
-            String testName = "testTransactionWritesWithShardNotInitiallyReady";
+    @Test
+    public void testSingleTransactionsWritesInQuickSuccession() throws Exception{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore = setupDistributedDataStore(
+                    "testSingleTransactionsWritesInQuickSuccession", "cars-1")) {
+
+                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+
+                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                writeTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                writeTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                doCommit(writeTx.ready());
+
+                writeTx = txChain.newWriteOnlyTransaction();
+
+                int nCars = 5;
+                for(int i = 0; i < nCars; i++) {
+                    writeTx.write(CarsModel.newCarPath("car" + i),
+                        CarsModel.newCarEntry("car" + i, BigInteger.valueOf(20000)));
+                }
+
+                doCommit(writeTx.ready());
+
+                Optional<NormalizedNode<?, ?>> optional = txChain.newReadOnlyTransaction().read(
+                    CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("# cars", nCars, ((Collection<?>)optional.get().getValue()).size());
+            }
+        }};
+    }
+
+    private void testTransactionWritesWithShardNotInitiallyReady(final String testName,
+            final boolean writeOnly) throws Exception {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
             String shardName = "test-1";
 
             // Setup the InMemoryJournal to block shard recovery to ensure the shard isn't
@@ -158,100 +314,99 @@ public class DistributedDataStoreIntegrationTest extends AbstractActorTest {
             CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
             InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
 
-            DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName);
+            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
 
-            // Create the write Tx
+                // Create the write Tx
 
-            final DOMStoreWriteTransaction writeTx = writeOnly ? dataStore.newWriteOnlyTransaction() :
+                final DOMStoreWriteTransaction writeTx = writeOnly ? dataStore.newWriteOnlyTransaction() :
                     dataStore.newReadWriteTransaction();
-            assertNotNull("newReadWriteTransaction returned null", writeTx);
+                assertNotNull("newReadWriteTransaction returned null", writeTx);
 
-            // Do some modification operations and ready the Tx on a separate thread.
+                // Do some modification operations and ready the Tx on a separate thread.
 
-            final YangInstanceIdentifier listEntryPath = YangInstanceIdentifier.builder(
+                final YangInstanceIdentifier listEntryPath = YangInstanceIdentifier.builder(
                     TestModel.OUTER_LIST_PATH).nodeWithKey(TestModel.OUTER_LIST_QNAME,
-                            TestModel.ID_QNAME, 1).build();
-
-            final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
-            final AtomicReference<Exception> caughtEx = new AtomicReference<>();
-            final CountDownLatch txReady = new CountDownLatch(1);
-            Thread txThread = new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        writeTx.write(TestModel.TEST_PATH,
+                        TestModel.ID_QNAME, 1).build();
+
+                final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
+                final AtomicReference<Exception> caughtEx = new AtomicReference<>();
+                final CountDownLatch txReady = new CountDownLatch(1);
+                Thread txThread = new Thread() {
+                    @Override
+                    public void run() {
+                        try {
+                            writeTx.write(TestModel.TEST_PATH,
                                 ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                        writeTx.merge(TestModel.OUTER_LIST_PATH, ImmutableNodes.mapNodeBuilder(
+                            writeTx.merge(TestModel.OUTER_LIST_PATH, ImmutableNodes.mapNodeBuilder(
                                 TestModel.OUTER_LIST_QNAME).build());
 
-                        writeTx.write(listEntryPath, ImmutableNodes.mapEntry(
+                            writeTx.write(listEntryPath, ImmutableNodes.mapEntry(
                                 TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1));
 
-                        writeTx.delete(listEntryPath);
+                            writeTx.delete(listEntryPath);
 
-                        txCohort.set(writeTx.ready());
-                    } catch(Exception e) {
-                        caughtEx.set(e);
-                        return;
-                    } finally {
-                        txReady.countDown();
+                            txCohort.set(writeTx.ready());
+                        } catch(Exception e) {
+                            caughtEx.set(e);
+                            return;
+                        } finally {
+                            txReady.countDown();
+                        }
                     }
-                }
-            };
-
-            txThread.start();
+                };
 
-            // Wait for the Tx operations to complete.
+                txThread.start();
 
-            boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
-            if(caughtEx.get() != null) {
-                throw caughtEx.get();
-            }
+                // Wait for the Tx operations to complete.
 
-            assertEquals("Tx ready", true, done);
+                boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
+                if(caughtEx.get() != null) {
+                    throw caughtEx.get();
+                }
 
-            // At this point the Tx operations should be waiting for the shard to initialize so
-            // trigger the latch to let the shard recovery to continue.
+                assertEquals("Tx ready", true, done);
 
-            blockRecoveryLatch.countDown();
+                // At this point the Tx operations should be waiting for the shard to initialize so
+                // trigger the latch to let the shard recovery to continue.
 
-            // Wait for the Tx commit to complete.
+                blockRecoveryLatch.countDown();
 
-            doCommit(txCohort.get());
+                // Wait for the Tx commit to complete.
 
-            // Verify the data in the store
+                doCommit(txCohort.get());
 
-            DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                // Verify the data in the store
 
-            Optional<NormalizedNode<?, ?>> optional = readTx.read(TestModel.TEST_PATH).
-                    get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", true, optional.isPresent());
+                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
 
-            optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", true, optional.isPresent());
+                Optional<NormalizedNode<?, ?>> optional = readTx.read(TestModel.TEST_PATH).
+                        get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
 
-            optional = readTx.read(listEntryPath).get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", false, optional.isPresent());
+                optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
 
-            cleanup(dataStore);
+                optional = readTx.read(listEntryPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", false, optional.isPresent());
+            }
         }};
     }
 
     @Test
     public void testWriteOnlyTransactionWithShardNotInitiallyReady() throws Exception {
         datastoreContextBuilder.writeOnlyTransactionOptimizationsEnabled(true);
-        testTransactionWritesWithShardNotInitiallyReady(true);
+        testTransactionWritesWithShardNotInitiallyReady("testWriteOnlyTransactionWithShardNotInitiallyReady", true);
     }
 
     @Test
     public void testReadWriteTransactionWithShardNotInitiallyReady() throws Exception {
-        testTransactionWritesWithShardNotInitiallyReady(false);
+        testTransactionWritesWithShardNotInitiallyReady("testReadWriteTransactionWithShardNotInitiallyReady", false);
     }
 
     @Test
     public void testTransactionReadsWithShardNotInitiallyReady() throws Exception {
-        new IntegrationTestKit(getSystem()) {{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
             String testName = "testTransactionReadsWithShardNotInitiallyReady";
             String shardName = "test-1";
 
@@ -261,70 +416,69 @@ public class DistributedDataStoreIntegrationTest extends AbstractActorTest {
             CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
             InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
 
-            DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName);
+            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
 
-            // Create the read-write Tx
+                // Create the read-write Tx
 
-            final DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
-            assertNotNull("newReadWriteTransaction returned null", readWriteTx);
+                final DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
+                assertNotNull("newReadWriteTransaction returned null", readWriteTx);
 
-            // Do some reads on the Tx on a separate thread.
+                // Do some reads on the Tx on a separate thread.
 
-            final AtomicReference<CheckedFuture<Boolean, ReadFailedException>> txExistsFuture =
-                    new AtomicReference<>();
-            final AtomicReference<CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException>>
-                    txReadFuture = new AtomicReference<>();
-            final AtomicReference<Exception> caughtEx = new AtomicReference<>();
-            final CountDownLatch txReadsDone = new CountDownLatch(1);
-            Thread txThread = new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        readWriteTx.write(TestModel.TEST_PATH,
+                final AtomicReference<CheckedFuture<Boolean, ReadFailedException>> txExistsFuture =
+                        new AtomicReference<>();
+                final AtomicReference<CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException>>
+                txReadFuture = new AtomicReference<>();
+                final AtomicReference<Exception> caughtEx = new AtomicReference<>();
+                final CountDownLatch txReadsDone = new CountDownLatch(1);
+                Thread txThread = new Thread() {
+                    @Override
+                    public void run() {
+                        try {
+                            readWriteTx.write(TestModel.TEST_PATH,
                                 ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                        txExistsFuture.set(readWriteTx.exists(TestModel.TEST_PATH));
+                            txExistsFuture.set(readWriteTx.exists(TestModel.TEST_PATH));
 
-                        txReadFuture.set(readWriteTx.read(TestModel.TEST_PATH));
-                    } catch(Exception e) {
-                        caughtEx.set(e);
-                        return;
-                    } finally {
-                        txReadsDone.countDown();
+                            txReadFuture.set(readWriteTx.read(TestModel.TEST_PATH));
+                        } catch(Exception e) {
+                            caughtEx.set(e);
+                            return;
+                        } finally {
+                            txReadsDone.countDown();
+                        }
                     }
-                }
-            };
+                };
 
-            txThread.start();
+                txThread.start();
 
-            // Wait for the Tx operations to complete.
+                // Wait for the Tx operations to complete.
 
-            boolean done = Uninterruptibles.awaitUninterruptibly(txReadsDone, 5, TimeUnit.SECONDS);
-            if(caughtEx.get() != null) {
-                throw caughtEx.get();
-            }
-
-            assertEquals("Tx reads done", true, done);
+                boolean done = Uninterruptibles.awaitUninterruptibly(txReadsDone, 5, TimeUnit.SECONDS);
+                if(caughtEx.get() != null) {
+                    throw caughtEx.get();
+                }
 
-            // At this point the Tx operations should be waiting for the shard to initialize so
-            // trigger the latch to let the shard recovery to continue.
+                assertEquals("Tx reads done", true, done);
 
-            blockRecoveryLatch.countDown();
+                // At this point the Tx operations should be waiting for the shard to initialize so
+                // trigger the latch to let the shard recovery to continue.
 
-            // Wait for the reads to complete and verify.
+                blockRecoveryLatch.countDown();
 
-            assertEquals("exists", true, txExistsFuture.get().checkedGet(5, TimeUnit.SECONDS));
-            assertEquals("read", true, txReadFuture.get().checkedGet(5, TimeUnit.SECONDS).isPresent());
+                // Wait for the reads to complete and verify.
 
-            readWriteTx.close();
+                assertEquals("exists", true, txExistsFuture.get().checkedGet(5, TimeUnit.SECONDS));
+                assertEquals("read", true, txReadFuture.get().checkedGet(5, TimeUnit.SECONDS).isPresent());
 
-            cleanup(dataStore);
+                readWriteTx.close();
+            }
         }};
     }
 
     @Test(expected=NotInitializedException.class)
     public void testTransactionCommitFailureWithShardNotInitialized() throws Throwable{
-        new IntegrationTestKit(getSystem()) {{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
             String testName = "testTransactionCommitFailureWithShardNotInitialized";
             String shardName = "test-1";
 
@@ -338,63 +492,65 @@ public class DistributedDataStoreIntegrationTest extends AbstractActorTest {
             CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
             InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
 
-            DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName);
+            InMemoryJournal.addEntry(persistentID, 1, "Dummy data so akka will read from persistence");
 
-            // Create the write Tx
+            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
 
-            final DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
-            assertNotNull("newReadWriteTransaction returned null", writeTx);
+                // Create the write Tx
 
-            // Do some modifications and ready the Tx on a separate thread.
+                final DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
+                assertNotNull("newReadWriteTransaction returned null", writeTx);
 
-            final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
-            final AtomicReference<Exception> caughtEx = new AtomicReference<>();
-            final CountDownLatch txReady = new CountDownLatch(1);
-            Thread txThread = new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        writeTx.write(TestModel.TEST_PATH,
+                // Do some modifications and ready the Tx on a separate thread.
+
+                final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
+                final AtomicReference<Exception> caughtEx = new AtomicReference<>();
+                final CountDownLatch txReady = new CountDownLatch(1);
+                Thread txThread = new Thread() {
+                    @Override
+                    public void run() {
+                        try {
+                            writeTx.write(TestModel.TEST_PATH,
                                 ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                        txCohort.set(writeTx.ready());
-                    } catch(Exception e) {
-                        caughtEx.set(e);
-                        return;
-                    } finally {
-                        txReady.countDown();
+                            txCohort.set(writeTx.ready());
+                        } catch(Exception e) {
+                            caughtEx.set(e);
+                            return;
+                        } finally {
+                            txReady.countDown();
+                        }
                     }
-                }
-            };
+                };
 
-            txThread.start();
+                txThread.start();
 
-            // Wait for the Tx operations to complete.
+                // Wait for the Tx operations to complete.
 
-            boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
-            if(caughtEx.get() != null) {
-                throw caughtEx.get();
-            }
+                boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
+                if(caughtEx.get() != null) {
+                    throw caughtEx.get();
+                }
 
-            assertEquals("Tx ready", true, done);
+                assertEquals("Tx ready", true, done);
 
-            // Wait for the commit to complete. Since the shard never initialized, the Tx should
-            // have timed out and throw an appropriate exception cause.
+                // Wait for the commit to complete. Since the shard never initialized, the Tx should
+                // have timed out and throw an appropriate exception cause.
 
-            try {
-                txCohort.get().canCommit().get(5, TimeUnit.SECONDS);
-            } catch(ExecutionException e) {
-                throw e.getCause();
-            } finally {
-                blockRecoveryLatch.countDown();
-                cleanup(dataStore);
+                try {
+                    txCohort.get().canCommit().get(5, TimeUnit.SECONDS);
+                } catch(ExecutionException e) {
+                    throw e.getCause();
+                } finally {
+                    blockRecoveryLatch.countDown();
+                }
             }
         }};
     }
 
     @Test(expected=NotInitializedException.class)
     public void testTransactionReadFailureWithShardNotInitialized() throws Throwable{
-        new IntegrationTestKit(getSystem()) {{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
             String testName = "testTransactionReadFailureWithShardNotInitialized";
             String shardName = "test-1";
 
@@ -408,128 +564,131 @@ public class DistributedDataStoreIntegrationTest extends AbstractActorTest {
             CountDownLatch blockRecoveryLatch = new CountDownLatch(1);
             InMemoryJournal.addBlockReadMessagesLatch(persistentID, blockRecoveryLatch);
 
-            DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName);
+            InMemoryJournal.addEntry(persistentID, 1, "Dummy data so akka will read from persistence");
 
-            // Create the read-write Tx
+            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
 
-            final DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
-            assertNotNull("newReadWriteTransaction returned null", readWriteTx);
+                // Create the read-write Tx
 
-            // Do a read on the Tx on a separate thread.
+                final DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction();
+                assertNotNull("newReadWriteTransaction returned null", readWriteTx);
 
-            final AtomicReference<CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException>>
-                    txReadFuture = new AtomicReference<>();
-            final AtomicReference<Exception> caughtEx = new AtomicReference<>();
-            final CountDownLatch txReadDone = new CountDownLatch(1);
-            Thread txThread = new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        readWriteTx.write(TestModel.TEST_PATH,
+                // Do a read on the Tx on a separate thread.
+
+                final AtomicReference<CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException>>
+                txReadFuture = new AtomicReference<>();
+                final AtomicReference<Exception> caughtEx = new AtomicReference<>();
+                final CountDownLatch txReadDone = new CountDownLatch(1);
+                Thread txThread = new Thread() {
+                    @Override
+                    public void run() {
+                        try {
+                            readWriteTx.write(TestModel.TEST_PATH,
                                 ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-                        txReadFuture.set(readWriteTx.read(TestModel.TEST_PATH));
+                            txReadFuture.set(readWriteTx.read(TestModel.TEST_PATH));
 
-                        readWriteTx.close();
-                    } catch(Exception e) {
-                        caughtEx.set(e);
-                        return;
-                    } finally {
-                        txReadDone.countDown();
+                            readWriteTx.close();
+                        } catch(Exception e) {
+                            caughtEx.set(e);
+                            return;
+                        } finally {
+                            txReadDone.countDown();
+                        }
                     }
-                }
-            };
+                };
 
-            txThread.start();
+                txThread.start();
 
-            // Wait for the Tx operations to complete.
+                // Wait for the Tx operations to complete.
 
-            boolean done = Uninterruptibles.awaitUninterruptibly(txReadDone, 5, TimeUnit.SECONDS);
-            if(caughtEx.get() != null) {
-                throw caughtEx.get();
-            }
+                boolean done = Uninterruptibles.awaitUninterruptibly(txReadDone, 5, TimeUnit.SECONDS);
+                if(caughtEx.get() != null) {
+                    throw caughtEx.get();
+                }
 
-            assertEquals("Tx read done", true, done);
+                assertEquals("Tx read done", true, done);
 
-            // Wait for the read to complete. Since the shard never initialized, the Tx should
-            // have timed out and throw an appropriate exception cause.
+                // Wait for the read to complete. Since the shard never initialized, the Tx should
+                // have timed out and throw an appropriate exception cause.
 
-            try {
-                txReadFuture.get().checkedGet(5, TimeUnit.SECONDS);
-            } catch(ReadFailedException e) {
-                throw e.getCause();
-            } finally {
-                blockRecoveryLatch.countDown();
-                cleanup(dataStore);
+                try {
+                    txReadFuture.get().checkedGet(5, TimeUnit.SECONDS);
+                } catch(ReadFailedException e) {
+                    throw e.getCause();
+                } finally {
+                    blockRecoveryLatch.countDown();
+                }
             }
         }};
     }
 
-    private void testTransactionCommitFailureWithNoShardLeader(final boolean writeOnly) throws Throwable {
-        new IntegrationTestKit(getSystem()) {{
-            String testName = "testTransactionCommitFailureWithNoShardLeader";
-            String shardName = "test-1";
-
-            // We don't want the shard to become the leader so prevent shard election from completing
-            // by setting the election timeout, which is based on the heartbeat interval, really high.
-
-            datastoreContextBuilder.shardHeartbeatIntervalInMillis(30000);
-            datastoreContextBuilder.shardInitializationTimeout(300, TimeUnit.MILLISECONDS);
-
-            // Set the leader election timeout low for the test.
+    private void testTransactionCommitFailureWithNoShardLeader(final boolean writeOnly, final String testName) throws Throwable {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            String shardName = "default";
+
+            // We don't want the shard to become the leader so prevent shard elections.
+            datastoreContextBuilder.customRaftPolicyImplementation(
+                    "org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy");
+
+            // The ShardManager uses the election timeout for FindPrimary so reset it low so it will timeout quickly.
+            datastoreContextBuilder.shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(1).
+                    shardInitializationTimeout(200, TimeUnit.MILLISECONDS);
+
+            try (DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName)) {
+
+                Object result = dataStore.getActorContext().executeOperation(
+                    dataStore.getActorContext().getShardManager(), new FindLocalShard(shardName, true));
+                assertTrue("Expected LocalShardFound. Actual: " + result, result instanceof LocalShardFound);
+
+                // Create the write Tx.
+
+                try (final DOMStoreWriteTransaction writeTx = writeOnly ? dataStore.newWriteOnlyTransaction() :
+                    dataStore.newReadWriteTransaction()) {
+                    assertNotNull("newReadWriteTransaction returned null", writeTx);
+
+                    // Do some modifications and ready the Tx on a separate thread.
+
+                    final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
+                    final AtomicReference<Exception> caughtEx = new AtomicReference<>();
+                    final CountDownLatch txReady = new CountDownLatch(1);
+                    Thread txThread = new Thread() {
+                        @Override
+                        public void run() {
+                            try {
+                                writeTx.write(TestModel.JUNK_PATH,
+                                    ImmutableNodes.containerNode(TestModel.JUNK_QNAME));
+
+                                txCohort.set(writeTx.ready());
+                            } catch(Exception e) {
+                                caughtEx.set(e);
+                                return;
+                            } finally {
+                                txReady.countDown();
+                            }
+                        }
+                    };
 
-            datastoreContextBuilder.shardLeaderElectionTimeout(1, TimeUnit.MILLISECONDS);
+                    txThread.start();
 
-            DistributedDataStore dataStore = setupDistributedDataStore(testName, false, shardName);
+                    // Wait for the Tx operations to complete.
 
-            // Create the write Tx.
+                    boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
+                    if(caughtEx.get() != null) {
+                        throw caughtEx.get();
+                    }
 
-            final DOMStoreWriteTransaction writeTx = writeOnly ? dataStore.newWriteOnlyTransaction() :
-                dataStore.newReadWriteTransaction();
-            assertNotNull("newReadWriteTransaction returned null", writeTx);
+                    assertEquals("Tx ready", true, done);
 
-            // Do some modifications and ready the Tx on a separate thread.
+                    // Wait for the commit to complete. Since no shard leader was elected in time, the Tx
+                    // should have timed out and throw an appropriate exception cause.
 
-            final AtomicReference<DOMStoreThreePhaseCommitCohort> txCohort = new AtomicReference<>();
-            final AtomicReference<Exception> caughtEx = new AtomicReference<>();
-            final CountDownLatch txReady = new CountDownLatch(1);
-            Thread txThread = new Thread() {
-                @Override
-                public void run() {
                     try {
-                        writeTx.write(TestModel.TEST_PATH,
-                                ImmutableNodes.containerNode(TestModel.TEST_QNAME));
-
-                        txCohort.set(writeTx.ready());
-                    } catch(Exception e) {
-                        caughtEx.set(e);
-                        return;
-                    } finally {
-                        txReady.countDown();
+                        txCohort.get().canCommit().get(5, TimeUnit.SECONDS);
+                    } catch(ExecutionException e) {
+                        throw e.getCause();
                     }
                 }
-            };
-
-            txThread.start();
-
-            // Wait for the Tx operations to complete.
-
-            boolean done = Uninterruptibles.awaitUninterruptibly(txReady, 5, TimeUnit.SECONDS);
-            if(caughtEx.get() != null) {
-                throw caughtEx.get();
-            }
-
-            assertEquals("Tx ready", true, done);
-
-            // Wait for the commit to complete. Since no shard leader was elected in time, the Tx
-            // should have timed out and throw an appropriate exception cause.
-
-            try {
-                txCohort.get().canCommit().get(5, TimeUnit.SECONDS);
-            } catch(ExecutionException e) {
-                throw e.getCause();
-            } finally {
-                cleanup(dataStore);
             }
         }};
     }
@@ -537,388 +696,511 @@ public class DistributedDataStoreIntegrationTest extends AbstractActorTest {
     @Test(expected=NoShardLeaderException.class)
     public void testWriteOnlyTransactionCommitFailureWithNoShardLeader() throws Throwable {
         datastoreContextBuilder.writeOnlyTransactionOptimizationsEnabled(true);
-        testTransactionCommitFailureWithNoShardLeader(true);
+        testTransactionCommitFailureWithNoShardLeader(true, "testWriteOnlyTransactionCommitFailureWithNoShardLeader");
     }
 
     @Test(expected=NoShardLeaderException.class)
     public void testReadWriteTransactionCommitFailureWithNoShardLeader() throws Throwable {
-        testTransactionCommitFailureWithNoShardLeader(false);
+        testTransactionCommitFailureWithNoShardLeader(false, "testReadWriteTransactionCommitFailureWithNoShardLeader");
     }
 
     @Test
     public void testTransactionAbort() throws Exception{
-        System.setProperty("shard.persistent", "true");
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore =
-                    setupDistributedDataStore("transactionAbortIntegrationTest", "test-1");
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore =
+                    setupDistributedDataStore("transactionAbortIntegrationTest", "test-1")) {
 
-            DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
-            assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+                DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
+                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
 
-            writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-            DOMStoreThreePhaseCommitCohort cohort = writeTx.ready();
+                DOMStoreThreePhaseCommitCohort cohort = writeTx.ready();
 
-            cohort.canCommit().get(5, TimeUnit.SECONDS);
+                cohort.canCommit().get(5, TimeUnit.SECONDS);
 
-            cohort.abort().get(5, TimeUnit.SECONDS);
+                cohort.abort().get(5, TimeUnit.SECONDS);
 
-            testWriteTransaction(dataStore, TestModel.TEST_PATH,
+                testWriteTransaction(dataStore, TestModel.TEST_PATH,
                     ImmutableNodes.containerNode(TestModel.TEST_QNAME));
-
-            cleanup(dataStore);
+            }
         }};
     }
 
     @Test
-    public void testTransactionChain() throws Exception{
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore = setupDistributedDataStore("testTransactionChain", "test-1");
+    public void testTransactionChainWithSingleShard() throws Exception{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore =
+                    setupDistributedDataStore("testTransactionChainWithSingleShard", "test-1")) {
 
-            // 1. Create a Tx chain and write-only Tx
+                // 1. Create a Tx chain and write-only Tx
 
-            DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-            DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
-            assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
 
-            // 2. Write some data
+                // 2. Write some data
 
-            NormalizedNode<?, ?> testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
-            writeTx.write(TestModel.TEST_PATH, testNode);
+                NormalizedNode<?, ?> testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
+                writeTx.write(TestModel.TEST_PATH, testNode);
 
-            // 3. Ready the Tx for commit
+                // 3. Ready the Tx for commit
 
-            final DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
+                final DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
 
-            // 4. Commit the Tx on another thread that first waits for the second read Tx.
+                // 4. Commit the Tx on another thread that first waits for the second read Tx.
 
-            final CountDownLatch continueCommit1 = new CountDownLatch(1);
-            final CountDownLatch commit1Done = new CountDownLatch(1);
-            final AtomicReference<Exception> commit1Error = new AtomicReference<>();
-            new Thread() {
-                @Override
-                public void run() {
-                    try {
-                        continueCommit1.await();
-                        doCommit(cohort1);
-                    } catch (Exception e) {
-                        commit1Error.set(e);
-                    } finally {
-                        commit1Done.countDown();
+                final CountDownLatch continueCommit1 = new CountDownLatch(1);
+                final CountDownLatch commit1Done = new CountDownLatch(1);
+                final AtomicReference<Exception> commit1Error = new AtomicReference<>();
+                new Thread() {
+                    @Override
+                    public void run() {
+                        try {
+                            continueCommit1.await();
+                            doCommit(cohort1);
+                        } catch (Exception e) {
+                            commit1Error.set(e);
+                        } finally {
+                            commit1Done.countDown();
+                        }
                     }
-                }
-            }.start();
+                }.start();
 
-            // 5. Create a new read Tx from the chain to read and verify the data from the first
-            // Tx is visible after being readied.
+                // 5. Create a new read Tx from the chain to read and verify the data from the first
+                // Tx is visible after being readied.
 
-            DOMStoreReadTransaction readTx = txChain.newReadOnlyTransaction();
-            Optional<NormalizedNode<?, ?>> optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", true, optional.isPresent());
-            assertEquals("Data node", testNode, optional.get());
+                DOMStoreReadTransaction readTx = txChain.newReadOnlyTransaction();
+                Optional<NormalizedNode<?, ?>> optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", testNode, optional.get());
 
-            // 6. Create a new RW Tx from the chain, write more data, and ready it
+                // 6. Create a new RW Tx from the chain, write more data, and ready it
 
-            DOMStoreReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
-            MapNode outerNode = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build();
-            rwTx.write(TestModel.OUTER_LIST_PATH, outerNode);
+                DOMStoreReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
+                MapNode outerNode = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build();
+                rwTx.write(TestModel.OUTER_LIST_PATH, outerNode);
+
+                DOMStoreThreePhaseCommitCohort cohort2 = rwTx.ready();
+
+                // 7. Create a new read Tx from the chain to read the data from the last RW Tx to
+                // verify it is visible.
 
-            DOMStoreThreePhaseCommitCohort cohort2 = rwTx.ready();
+                readTx = txChain.newReadWriteTransaction();
+                optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", outerNode, optional.get());
 
-            // 7. Create a new read Tx from the chain to read the data from the last RW Tx to
-            // verify it is visible.
+                // 8. Wait for the 2 commits to complete and close the chain.
+
+                continueCommit1.countDown();
+                Uninterruptibles.awaitUninterruptibly(commit1Done, 5, TimeUnit.SECONDS);
+
+                if(commit1Error.get() != null) {
+                    throw commit1Error.get();
+                }
 
-            readTx = txChain.newReadWriteTransaction();
-            optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", true, optional.isPresent());
-            assertEquals("Data node", outerNode, optional.get());
+                doCommit(cohort2);
 
-            // 8. Wait for the 2 commits to complete and close the chain.
+                txChain.close();
 
-            continueCommit1.countDown();
-            Uninterruptibles.awaitUninterruptibly(commit1Done, 5, TimeUnit.SECONDS);
+                // 9. Create a new read Tx from the data store and verify committed data.
 
-            if(commit1Error.get() != null) {
-                throw commit1Error.get();
+                readTx = dataStore.newReadOnlyTransaction();
+                optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", outerNode, optional.get());
             }
+        }};
+    }
+
+    @Test
+    public void testTransactionChainWithMultipleShards() throws Exception{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore = setupDistributedDataStore("testTransactionChainWithMultipleShards",
+                    "cars-1", "people-1")) {
+
+                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+
+                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+
+                writeTx.write(CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                writeTx.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
+
+                writeTx.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                writeTx.write(PeopleModel.PERSON_LIST_PATH, PeopleModel.newPersonMapNode());
+
+                DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
+
+                DOMStoreReadWriteTransaction readWriteTx = txChain.newReadWriteTransaction();
+
+                MapEntryNode car = CarsModel.newCarEntry("optima", BigInteger.valueOf(20000));
+                YangInstanceIdentifier carPath = CarsModel.newCarPath("optima");
+                readWriteTx.write(carPath, car);
+
+                MapEntryNode person = PeopleModel.newPersonEntry("jack");
+                YangInstanceIdentifier personPath = PeopleModel.newPersonPath("jack");
+                readWriteTx.merge(personPath, person);
 
-            doCommit(cohort2);
+                Optional<NormalizedNode<?, ?>> optional = readWriteTx.read(carPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", car, optional.get());
 
-            txChain.close();
+                optional = readWriteTx.read(personPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", person, optional.get());
 
-            // 9. Create a new read Tx from the data store and verify committed data.
+                DOMStoreThreePhaseCommitCohort cohort2 = readWriteTx.ready();
 
-            readTx = dataStore.newReadOnlyTransaction();
-            optional = readTx.read(TestModel.OUTER_LIST_PATH).get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", true, optional.isPresent());
-            assertEquals("Data node", outerNode, optional.get());
+                writeTx = txChain.newWriteOnlyTransaction();
 
-            cleanup(dataStore);
+                writeTx.delete(carPath);
+
+                DOMStoreThreePhaseCommitCohort cohort3 = writeTx.ready();
+
+                ListenableFuture<Boolean> canCommit1 = cohort1.canCommit();
+                ListenableFuture<Boolean> canCommit2 = cohort2.canCommit();
+
+                doCommit(canCommit1, cohort1);
+                doCommit(canCommit2, cohort2);
+                doCommit(cohort3);
+
+                txChain.close();
+
+                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+
+                optional = readTx.read(carPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", false, optional.isPresent());
+
+                optional = readTx.read(personPath).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", person, optional.get());
+            }
         }};
     }
 
     @Test
     public void testCreateChainedTransactionsInQuickSuccession() throws Exception{
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore = setupDistributedDataStore(
-                    "testCreateChainedTransactionsInQuickSuccession", "test-1");
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore = setupDistributedDataStore(
+                    "testCreateChainedTransactionsInQuickSuccession", "cars-1")) {
 
-            DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+                ConcurrentDOMDataBroker broker = new ConcurrentDOMDataBroker(
+                    ImmutableMap.<LogicalDatastoreType, DOMStore>builder().put(
+                        LogicalDatastoreType.CONFIGURATION, dataStore).build(), MoreExecutors.directExecutor());
 
-            NormalizedNode<?, ?> testNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
+                TransactionChainListener listener = Mockito.mock(TransactionChainListener.class);
+                DOMTransactionChain txChain = broker.createTransactionChain(listener);
 
-            int nTxs = 20;
-            List<DOMStoreThreePhaseCommitCohort> cohorts = new ArrayList<>(nTxs);
-            for(int i = 0; i < nTxs; i++) {
-                DOMStoreReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
+                List<CheckedFuture<Void, TransactionCommitFailedException>> futures = new ArrayList<>();
 
-                rwTx.merge(TestModel.TEST_PATH, testNode);
+                DOMDataWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                writeTx.put(LogicalDatastoreType.CONFIGURATION, CarsModel.BASE_PATH, CarsModel.emptyContainer());
+                writeTx.put(LogicalDatastoreType.CONFIGURATION, CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode());
+                futures.add(writeTx.submit());
 
-                cohorts.add(rwTx.ready());
+                int nCars = 100;
+                for(int i = 0; i < nCars; i++) {
+                    DOMDataReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
 
-            }
+                    rwTx.merge(LogicalDatastoreType.CONFIGURATION, CarsModel.newCarPath("car" + i),
+                        CarsModel.newCarEntry("car" + i, BigInteger.valueOf(20000)));
 
-            for(DOMStoreThreePhaseCommitCohort cohort: cohorts) {
-                doCommit(cohort);
-            }
+                    futures.add(rwTx.submit());
+                }
+
+                for(CheckedFuture<Void, TransactionCommitFailedException> f: futures) {
+                    f.checkedGet();
+                }
 
-            txChain.close();
+                Optional<NormalizedNode<?, ?>> optional = txChain.newReadOnlyTransaction().read(
+                    LogicalDatastoreType.CONFIGURATION, CarsModel.CAR_LIST_PATH).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("# cars", nCars, ((Collection<?>)optional.get().getValue()).size());
 
-            cleanup(dataStore);
+                txChain.close();
+
+                broker.close();
+            }
         }};
     }
 
     @Test
     public void testCreateChainedTransactionAfterEmptyTxReadied() throws Exception{
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore = setupDistributedDataStore(
-                    "testCreateChainedTransactionAfterEmptyTxReadied", "test-1");
-
-            DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore = setupDistributedDataStore(
+                    "testCreateChainedTransactionAfterEmptyTxReadied", "test-1")) {
 
-            DOMStoreReadWriteTransaction rwTx1 = txChain.newReadWriteTransaction();
+                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-            rwTx1.ready();
+                DOMStoreReadWriteTransaction rwTx1 = txChain.newReadWriteTransaction();
 
-            DOMStoreReadWriteTransaction rwTx2 = txChain.newReadWriteTransaction();
+                rwTx1.ready();
 
-            Optional<NormalizedNode<?, ?>> optional = rwTx2.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", false, optional.isPresent());
+                DOMStoreReadWriteTransaction rwTx2 = txChain.newReadWriteTransaction();
 
-            txChain.close();
+                Optional<NormalizedNode<?, ?>> optional = rwTx2.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", false, optional.isPresent());
 
-            cleanup(dataStore);
+                txChain.close();
+            }
         }};
     }
 
     @Test
     public void testCreateChainedTransactionWhenPreviousNotReady() throws Throwable {
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore = setupDistributedDataStore(
-                    "testCreateChainedTransactionWhenPreviousNotReady", "test-1");
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore = setupDistributedDataStore(
+                "testCreateChainedTransactionWhenPreviousNotReady", "test-1")) {
 
-            final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+                final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-            DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
-            assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                assertNotNull("newWriteOnlyTransaction returned null", writeTx);
 
-            writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-            // Try to create another Tx of each type - each should fail b/c the previous Tx wasn't
-            // readied.
+                // Try to create another Tx of each type - each should fail b/c the previous Tx wasn't
+                // readied.
 
-            assertExceptionOnTxChainCreates(txChain, IllegalStateException.class);
+                assertExceptionOnTxChainCreates(txChain, IllegalStateException.class);
+            }
         }};
     }
 
     @Test
     public void testCreateChainedTransactionAfterClose() throws Throwable {
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore = setupDistributedDataStore(
-                    "testCreateChainedTransactionAfterClose", "test-1");
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore = setupDistributedDataStore(
+                "testCreateChainedTransactionAfterClose", "test-1")) {
 
-            DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
+                DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-            txChain.close();
+                txChain.close();
 
-            // Try to create another Tx of each type - should fail b/c the previous Tx was closed.
+                // Try to create another Tx of each type - should fail b/c the previous Tx was closed.
 
-            assertExceptionOnTxChainCreates(txChain, TransactionChainClosedException.class);
+                assertExceptionOnTxChainCreates(txChain, TransactionChainClosedException.class);
+            }
         }};
     }
 
     @Test
-    public void testChangeListenerRegistration() throws Exception{
-        new IntegrationTestKit(getSystem()) {{
-            DistributedDataStore dataStore =
-                    setupDistributedDataStore("testChangeListenerRegistration", "test-1");
-
-            testWriteTransaction(dataStore, TestModel.TEST_PATH,
-                    ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+    public void testChainWithReadOnlyTxAfterPreviousReady() throws Throwable {
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore = setupDistributedDataStore(
+                "testChainWithReadOnlyTxAfterPreviousReady", "test-1")) {
 
-            MockDataChangeListener listener = new MockDataChangeListener(1);
+                final DOMStoreTransactionChain txChain = dataStore.createTransactionChain();
 
-            ListenerRegistration<MockDataChangeListener>
-                    listenerReg = dataStore.registerChangeListener(TestModel.TEST_PATH, listener,
-                            DataChangeScope.SUBTREE);
+                // Create a write tx and submit.
 
-            assertNotNull("registerChangeListener returned null", listenerReg);
+                DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+                writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
+                DOMStoreThreePhaseCommitCohort cohort1 = writeTx.ready();
 
-            // Wait for the initial notification
+                // Create read-only tx's and issue a read.
 
-            listener.waitForChangeEvents(TestModel.TEST_PATH);
+                CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> readFuture1 =
+                        txChain.newReadOnlyTransaction().read(TestModel.TEST_PATH);
 
-            listener.reset(2);
+                CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> readFuture2 =
+                        txChain.newReadOnlyTransaction().read(TestModel.TEST_PATH);
 
-            // Write 2 updates.
+                // Create another write tx and issue the write.
 
-            testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH,
+                DOMStoreWriteTransaction writeTx2 = txChain.newWriteOnlyTransaction();
+                writeTx2.write(TestModel.OUTER_LIST_PATH,
                     ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
 
-            YangInstanceIdentifier listPath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH).
-                    nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build();
-            testWriteTransaction(dataStore, listPath,
-                    ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1));
-
-            // Wait for the 2 updates.
+                // Ensure the reads succeed.
 
-            listener.waitForChangeEvents(TestModel.OUTER_LIST_PATH, listPath);
+                assertEquals("isPresent", true, readFuture1.checkedGet(5, TimeUnit.SECONDS).isPresent());
+                assertEquals("isPresent", true, readFuture2.checkedGet(5, TimeUnit.SECONDS).isPresent());
 
-            listenerReg.close();
+                // Ensure the writes succeed.
 
-            testWriteTransaction(dataStore, YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH).
-                    nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build(),
-                    ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2));
+                DOMStoreThreePhaseCommitCohort cohort2 = writeTx2.ready();
 
-            listener.expectNoMoreChanges("Received unexpected change after close");
+                doCommit(cohort1);
+                doCommit(cohort2);
 
-            cleanup(dataStore);
+                assertEquals("isPresent", true, txChain.newReadOnlyTransaction().read(TestModel.OUTER_LIST_PATH).
+                    checkedGet(5, TimeUnit.SECONDS).isPresent());
+            }
         }};
     }
 
-    class IntegrationTestKit extends ShardTestKit {
+    @Test
+    public void testChainedTransactionFailureWithSingleShard() throws Exception{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore = setupDistributedDataStore(
+                    "testChainedTransactionFailureWithSingleShard", "cars-1")) {
 
-        IntegrationTestKit(ActorSystem actorSystem) {
-            super(actorSystem);
-        }
+                ConcurrentDOMDataBroker broker = new ConcurrentDOMDataBroker(
+                    ImmutableMap.<LogicalDatastoreType, DOMStore>builder().put(
+                        LogicalDatastoreType.CONFIGURATION, dataStore).build(), MoreExecutors.directExecutor());
 
-        DistributedDataStore setupDistributedDataStore(String typeName, String... shardNames) {
-            return setupDistributedDataStore(typeName, true, shardNames);
-        }
+                TransactionChainListener listener = Mockito.mock(TransactionChainListener.class);
+                DOMTransactionChain txChain = broker.createTransactionChain(listener);
 
-        DistributedDataStore setupDistributedDataStore(String typeName, boolean waitUntilLeader,
-                String... shardNames) {
-            MockClusterWrapper cluster = new MockClusterWrapper();
-            Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
-            ShardStrategyFactory.setConfiguration(config);
+                DOMDataReadWriteTransaction rwTx = txChain.newReadWriteTransaction();
 
-            datastoreContextBuilder.dataStoreType(typeName);
+                ContainerNode invalidData = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
+                    new YangInstanceIdentifier.NodeIdentifier(CarsModel.BASE_QNAME)).
+                        withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build();
 
-            DatastoreContext datastoreContext = datastoreContextBuilder.build();
+                rwTx.merge(LogicalDatastoreType.CONFIGURATION, CarsModel.BASE_PATH, invalidData);
 
-            DistributedDataStore dataStore = new DistributedDataStore(getSystem(), cluster,
-                    config, datastoreContext);
+                try {
+                    rwTx.submit().checkedGet(5, TimeUnit.SECONDS);
+                    fail("Expected TransactionCommitFailedException");
+                } catch (TransactionCommitFailedException e) {
+                    // Expected
+                }
 
-            SchemaContext schemaContext = SchemaContextHelper.full();
-            dataStore.onGlobalContextUpdated(schemaContext);
+                verify(listener, timeout(5000)).onTransactionChainFailed(eq(txChain), eq(rwTx), any(Throwable.class));
 
-            if(waitUntilLeader) {
-                for(String shardName: shardNames) {
-                    ActorRef shard = null;
-                    for(int i = 0; i < 20 * 5 && shard == null; i++) {
-                        Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
-                        Optional<ActorRef> shardReply = dataStore.getActorContext().findLocalShard(shardName);
-                        if(shardReply.isPresent()) {
-                            shard = shardReply.get();
-                        }
-                    }
+                txChain.close();
+                broker.close();
+            }
+        }};
+    }
 
-                    assertNotNull("Shard was not created", shard);
+    @Test
+    public void testChainedTransactionFailureWithMultipleShards() throws Exception{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore = setupDistributedDataStore(
+                    "testChainedTransactionFailureWithMultipleShards", "cars-1", "people-1")) {
+
+                ConcurrentDOMDataBroker broker = new ConcurrentDOMDataBroker(
+                    ImmutableMap.<LogicalDatastoreType, DOMStore>builder().put(
+                        LogicalDatastoreType.CONFIGURATION, dataStore).build(), MoreExecutors.directExecutor());
+
+                TransactionChainListener listener = Mockito.mock(TransactionChainListener.class);
+                DOMTransactionChain txChain = broker.createTransactionChain(listener);
+
+                DOMDataWriteTransaction writeTx = txChain.newWriteOnlyTransaction();
+
+                writeTx.put(LogicalDatastoreType.CONFIGURATION, PeopleModel.BASE_PATH, PeopleModel.emptyContainer());
+
+                ContainerNode invalidData = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
+                    new YangInstanceIdentifier.NodeIdentifier(CarsModel.BASE_QNAME)).
+                        withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build();
 
-                    waitUntilLeader(shard);
+                // Note that merge will validate the data and fail but put succeeds b/c deep validation is not
+                // done for put for performance reasons.
+                writeTx.merge(LogicalDatastoreType.CONFIGURATION, CarsModel.BASE_PATH, invalidData);
+
+                try {
+                    writeTx.submit().checkedGet(5, TimeUnit.SECONDS);
+                    fail("Expected TransactionCommitFailedException");
+                } catch (TransactionCommitFailedException e) {
+                    // Expected
                 }
+
+                verify(listener, timeout(5000)).onTransactionChainFailed(eq(txChain), eq(writeTx), any(Throwable.class));
+
+                txChain.close();
+                broker.close();
             }
+        }};
+    }
 
-            return dataStore;
-        }
+    @Test
+    public void testChangeListenerRegistration() throws Exception{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            try (DistributedDataStore dataStore =
+                    setupDistributedDataStore("testChangeListenerRegistration", "test-1")) {
 
-        void testWriteTransaction(DistributedDataStore dataStore, YangInstanceIdentifier nodePath,
-                NormalizedNode<?, ?> nodeToWrite) throws Exception {
+                testWriteTransaction(dataStore, TestModel.TEST_PATH,
+                    ImmutableNodes.containerNode(TestModel.TEST_QNAME));
 
-            // 1. Create a write-only Tx
+                MockDataChangeListener listener = new MockDataChangeListener(1);
 
-            DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction();
-            assertNotNull("newWriteOnlyTransaction returned null", writeTx);
+                ListenerRegistration<MockDataChangeListener>
+                listenerReg = dataStore.registerChangeListener(TestModel.TEST_PATH, listener,
+                    DataChangeScope.SUBTREE);
 
-            // 2. Write some data
+                assertNotNull("registerChangeListener returned null", listenerReg);
 
-            writeTx.write(nodePath, nodeToWrite);
+                // Wait for the initial notification
 
-            // 3. Ready the Tx for commit
+                listener.waitForChangeEvents(TestModel.TEST_PATH);
 
-            DOMStoreThreePhaseCommitCohort cohort = writeTx.ready();
+                listener.reset(2);
 
-            // 4. Commit the Tx
+                // Write 2 updates.
 
-            doCommit(cohort);
+                testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH,
+                    ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
 
-            // 5. Verify the data in the store
+                YangInstanceIdentifier listPath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH).
+                        nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build();
+                testWriteTransaction(dataStore, listPath,
+                    ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1));
 
-            DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+                // Wait for the 2 updates.
 
-            Optional<NormalizedNode<?, ?>> optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS);
-            assertEquals("isPresent", true, optional.isPresent());
-            assertEquals("Data node", nodeToWrite, optional.get());
-        }
+                listener.waitForChangeEvents(TestModel.OUTER_LIST_PATH, listPath);
 
-        void doCommit(final DOMStoreThreePhaseCommitCohort cohort) throws Exception {
-            Boolean canCommit = cohort.canCommit().get(5, TimeUnit.SECONDS);
-            assertEquals("canCommit", true, canCommit);
-            cohort.preCommit().get(5, TimeUnit.SECONDS);
-            cohort.commit().get(5, TimeUnit.SECONDS);
-        }
+                listenerReg.close();
 
-        void cleanup(DistributedDataStore dataStore) {
-            dataStore.getActorContext().getShardManager().tell(PoisonPill.getInstance(), null);
-        }
+                testWriteTransaction(dataStore, YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH).
+                    nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build(),
+                    ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2));
 
-        void assertExceptionOnCall(Callable<Void> callable, Class<? extends Exception> expType)
-                throws Exception {
-            try {
-                callable.call();
-                fail("Expected " + expType.getSimpleName());
-            } catch(Exception e) {
-                assertEquals("Exception type", expType, e.getClass());
+                listener.expectNoMoreChanges("Received unexpected change after close");
             }
-        }
-
-        void assertExceptionOnTxChainCreates(final DOMStoreTransactionChain txChain,
-                Class<? extends Exception> expType) throws Exception {
-            assertExceptionOnCall(new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    txChain.newWriteOnlyTransaction();
-                    return null;
-                }
-            }, expType);
+        }};
+    }
 
-            assertExceptionOnCall(new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    txChain.newReadWriteTransaction();
-                    return null;
-                }
-            }, expType);
+    @Test
+    public void testRestoreFromDatastoreSnapshot() throws Exception{
+        new IntegrationTestKit(getSystem(), datastoreContextBuilder) {{
+            String name = "transactionIntegrationTest";
 
-            assertExceptionOnCall(new Callable<Void>() {
-                @Override
-                public Void call() throws Exception {
-                    txChain.newReadOnlyTransaction();
-                    return null;
-                }
-            }, expType);
-        }
-    }
+            ContainerNode carsNode = CarsModel.newCarsNode(CarsModel.newCarsMapNode(
+                    CarsModel.newCarEntry("optima", BigInteger.valueOf(20000L)),
+                    CarsModel.newCarEntry("sportage", BigInteger.valueOf(30000L))));
+
+            ShardDataTree dataTree = new ShardDataTree(SchemaContextHelper.full(), TreeType.OPERATIONAL);
+            AbstractShardTest.writeToStore(dataTree, CarsModel.BASE_PATH, carsNode);
+            NormalizedNode<?, ?> root = AbstractShardTest.readStore(dataTree.getDataTree(),
+                    YangInstanceIdentifier.EMPTY);
+
+            Snapshot carsSnapshot = Snapshot.create(SerializationUtils.serializeNormalizedNode(root),
+                    Collections.<ReplicatedLogEntry>emptyList(), 2, 1, 2, 1, 1, "member-1");
+
+            NormalizedNode<?, ?> peopleNode = PeopleModel.create();
+            dataTree = new ShardDataTree(SchemaContextHelper.full(), TreeType.OPERATIONAL);
+            AbstractShardTest.writeToStore(dataTree, PeopleModel.BASE_PATH, peopleNode);
+            root = AbstractShardTest.readStore(dataTree.getDataTree(), YangInstanceIdentifier.EMPTY);
+
+            Snapshot peopleSnapshot = Snapshot.create(SerializationUtils.serializeNormalizedNode(root),
+                    Collections.<ReplicatedLogEntry>emptyList(), 2, 1, 2, 1, 1, "member-1");
+
+            restoreFromSnapshot = new DatastoreSnapshot(name, null, Arrays.asList(
+                    new DatastoreSnapshot.ShardSnapshot("cars",
+                            org.apache.commons.lang3.SerializationUtils.serialize(carsSnapshot)),
+                    new DatastoreSnapshot.ShardSnapshot("people",
+                            org.apache.commons.lang3.SerializationUtils.serialize(peopleSnapshot))));
 
+            try (DistributedDataStore dataStore = setupDistributedDataStore(name, "module-shards-member1.conf",
+                    true, "cars", "people")) {
+
+                DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction();
+
+                Optional<NormalizedNode<?, ?>> optional = readTx.read(CarsModel.BASE_PATH).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", carsNode, optional.get());
+
+                optional = readTx.read(PeopleModel.BASE_PATH).get(5, TimeUnit.SECONDS);
+                assertEquals("isPresent", true, optional.isPresent());
+                assertEquals("Data node", peopleNode, optional.get());
+            }
+        }};
+    }
 }