X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDistributedDataStoreFactory.java;h=4fd09914cdb6eb5185247bf51f6177064aba7337;hb=b5cb353e3553a39f576c284119af75ffa5ea66a9;hp=e5b6f695474487782ee31887ce9ffba0ca53afe7;hpb=5e915f20960251778161b23a0ed9c62cdafb71aa;p=controller.git

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 e5b6f69547..4fd09914cd 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
@@ -14,6 +14,7 @@ import org.opendaylight.controller.cluster.datastore.config.Configuration;
 import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl;
 import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,31 +22,50 @@ import org.slf4j.LoggerFactory;
 public class DistributedDataStoreFactory {
     private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStoreFactory.class);
 
+    /**
+     * Create a data store instance.
+     *
+     * @deprecated Use {@link #createInstance(DOMSchemaService, DatastoreContext, DatastoreSnapshotRestore,
+     *                        ActorSystemProvider, BundleContext)} instead.
+     */
+    @Deprecated
     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());
+        return createInstance((DOMSchemaService) schemaService, initialDatastoreContext, datastoreSnapshotRestore,
+            actorSystemProvider, bundleContext);
+    }
+
+    public static AbstractDataStore createInstance(final DOMSchemaService schemaService,
+            final DatastoreContext initialDatastoreContext, final DatastoreSnapshotRestore datastoreSnapshotRestore,
+            final ActorSystemProvider actorSystemProvider, final BundleContext bundleContext) {
 
-        ActorSystem actorSystem = actorSystemProvider.getActorSystem();
-        DatastoreSnapshot restoreFromSnapshot = datastoreSnapshotRestore.getAndRemove(
-                datastoreContext.getDataStoreName());
-        DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
-        DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay(
+        final String datastoreName = initialDatastoreContext.getDataStoreName();
+        LOG.info("Create data store instance of type : {}", datastoreName);
+
+        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();
+
+        // 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", datastoreContext.getDataStoreName());
+            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);