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=221db2faea0ff6157db7f609f9af9179aecfec6b;hb=refs%2Fchanges%2F70%2F91770%2F4;hp=be6d2d5c4b0f825b87907ea91f26d3766c20ffd7;hpb=5a0edd493bafc365647bc6311b4b7da86a78645d;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 be6d2d5c4b..221db2faea 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,43 +12,80 @@ 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.sal.core.api.model.SchemaService;
-import org.osgi.framework.BundleContext;
+import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DistributedDataStoreFactory {
-    private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStoreFactory.class);
+public final class DistributedDataStoreFactory {
 
-    public static AbstractDataStore createInstance(final SchemaService schemaService,
-            final DatastoreContext datastoreContext, final DatastoreSnapshotRestore datastoreSnapshotRestore,
-            final ActorSystemProvider actorSystemProvider, final BundleContext bundleContext) {
+    private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStoreFactory.class);
+    private static final String DEFAULT_MODULE_SHARDS_PATH = "./configuration/initial/module-shards.conf";
+    private static final String DEFAULT_MODULES_PATH = "./configuration/initial/modules.conf";
 
-        LOG.info("Create data store instance of type : {}", datastoreContext.getDataStoreName());
+    private DistributedDataStoreFactory() {
+    }
 
-        ActorSystem actorSystem = actorSystemProvider.getActorSystem();
-        DatastoreSnapshot restoreFromSnapshot = datastoreSnapshotRestore.getAndRemove(
-                datastoreContext.getDataStoreName());
-        DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
-        DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay(
-                introspector, bundleContext);
+    public static AbstractDataStore createInstance(final DOMSchemaService schemaService,
+            final DatastoreContext initialDatastoreContext, final DatastoreSnapshotRestore datastoreSnapshotRestore,
+            final ActorSystemProvider actorSystemProvider, final DatastoreContextIntrospector introspector,
+            final DatastoreContextPropertiesUpdater updater) {
+        return createInstance(schemaService, initialDatastoreContext, datastoreSnapshotRestore, actorSystemProvider,
+                introspector, updater, null);
+    }
 
-        Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
-        ClusterWrapper clusterWrapper = new ClusterWrapperImpl(actorSystem);
-        DatastoreContextFactory contextFactory = introspector.newContextFactory();
+    // TODO: separate out settle wait so it is better controlled
+    public static AbstractDataStore createInstance(final DOMSchemaService schemaService,
+            final DatastoreContext initialDatastoreContext, final DatastoreSnapshotRestore datastoreSnapshotRestore,
+            final ActorSystemProvider actorSystemProvider, final DatastoreContextIntrospector introspector,
+            final DatastoreContextPropertiesUpdater updater, final Configuration orgConfig) {
 
-        final AbstractDataStore dataStore = datastoreContext.isUseTellBasedProtocol()
-                ? new ClientBackedDataStore(actorSystem, clusterWrapper, config, contextFactory, restoreFromSnapshot) :
-                    new DistributedDataStore(actorSystem, clusterWrapper, config, contextFactory, restoreFromSnapshot);
+        final AbstractDataStore dataStore = createInstance(actorSystemProvider, initialDatastoreContext,
+            introspector, datastoreSnapshotRestore, orgConfig);
 
-        overlay.setListener(dataStore);
+        updater.setListener(dataStore);
 
         schemaService.registerSchemaContextListener(dataStore);
 
-        dataStore.setCloseable(overlay);
+        dataStore.setCloseable(updater);
         dataStore.waitTillReady();
 
         return dataStore;
     }
+
+    public static AbstractDataStore createInstance(final ActorSystemProvider actorSystemProvider,
+            final DatastoreContext initialDatastoreContext, final DatastoreContextIntrospector introspector,
+            final DatastoreSnapshotRestore datastoreSnapshotRestore, final Configuration orgConfig) {
+
+        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).orElse(null);
+
+        final Configuration config;
+        if (orgConfig == null) {
+            config = new ConfigurationImpl(DEFAULT_MODULE_SHARDS_PATH, DEFAULT_MODULES_PATH);
+        } else {
+            config = orgConfig;
+        }
+        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", datastoreName);
+        } else {
+            dataStore = new DistributedDataStore(actorSystem, clusterWrapper, config, contextFactory,
+                restoreFromSnapshot);
+            LOG.info("Data store {} is using ask-based protocol", datastoreName);
+        }
+
+        return dataStore;
+    }
 }