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%2FDistributedDataStoreFactory.java;h=b62cd3d6d35826152bd38fa066f7eb1010786a0b;hp=be6d2d5c4b0f825b87907ea91f26d3766c20ffd7;hb=39b7a263d64559bc4f593726f56aa38ab9cc0b1c;hpb=5a0edd493bafc365647bc6311b4b7da86a78645d

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreFactory.java
index be6d2d5c4b..b62cd3d6d3 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreFactory.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreFactory.java
@@ -12,7 +12,7 @@ import org.opendaylight.controller.cluster.ActorSystemProvider;
 import org.opendaylight.controller.cluster.databroker.ClientBackedDataStore;
 import org.opendaylight.controller.cluster.datastore.config.Configuration;
 import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl;
-import org.opendaylight.controller.cluster.datastore.messages.DatastoreSnapshot;
+import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
@@ -22,25 +22,35 @@ public class DistributedDataStoreFactory {
     private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStoreFactory.class);
 
     public static AbstractDataStore createInstance(final SchemaService schemaService,
-            final DatastoreContext datastoreContext, final DatastoreSnapshotRestore datastoreSnapshotRestore,
+            final DatastoreContext initialDatastoreContext, final DatastoreSnapshotRestore datastoreSnapshotRestore,
             final ActorSystemProvider actorSystemProvider, final BundleContext bundleContext) {
 
-        LOG.info("Create data store instance of type : {}", datastoreContext.getDataStoreName());
+        final String datastoreName = initialDatastoreContext.getDataStoreName();
+        LOG.info("Create data store instance of type : {}", datastoreName);
 
-        ActorSystem actorSystem = actorSystemProvider.getActorSystem();
-        DatastoreSnapshot restoreFromSnapshot = datastoreSnapshotRestore.getAndRemove(
-                datastoreContext.getDataStoreName());
-        DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
-        DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay(
+        final ActorSystem actorSystem = actorSystemProvider.getActorSystem();
+        final DatastoreSnapshot restoreFromSnapshot = datastoreSnapshotRestore.getAndRemove(datastoreName);
+        final DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(initialDatastoreContext);
+        final DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay(
                 introspector, bundleContext);
 
-        Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
-        ClusterWrapper clusterWrapper = new ClusterWrapperImpl(actorSystem);
-        DatastoreContextFactory contextFactory = introspector.newContextFactory();
+        final Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
+        final ClusterWrapper clusterWrapper = new ClusterWrapperImpl(actorSystem);
+        final DatastoreContextFactory contextFactory = introspector.newContextFactory();
 
-        final AbstractDataStore dataStore = datastoreContext.isUseTellBasedProtocol()
-                ? new ClientBackedDataStore(actorSystem, clusterWrapper, config, contextFactory, restoreFromSnapshot) :
-                    new DistributedDataStore(actorSystem, clusterWrapper, config, contextFactory, restoreFromSnapshot);
+        // This is the potentially-updated datastore context, distinct from the initial one
+        final DatastoreContext datastoreContext = contextFactory.getBaseDatastoreContext();
+
+        final AbstractDataStore dataStore;
+        if (datastoreContext.isUseTellBasedProtocol()) {
+            dataStore = new ClientBackedDataStore(actorSystem, clusterWrapper, config, contextFactory,
+                restoreFromSnapshot);
+            LOG.info("Data store {} is using tell-based protocol", datastoreName);
+        } else {
+            dataStore = new DistributedDataStore(actorSystem, clusterWrapper, config, contextFactory,
+                restoreFromSnapshot);
+            LOG.info("Data store {} is using ask-based protocol", datastoreName);
+        }
 
         overlay.setListener(dataStore);