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=8199e33294874f729dcc886fa482c9937eb73f1e;hb=e2d9f9c57e124d46e117f17c44b77c89222fdb99;hp=004faf2de1a42b833877a16efdac1f35ef9c086f;hpb=dd32d3d246ebad8b7c76afb93239a4462f329a6b;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 004faf2de1..8199e33294 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
@@ -5,7 +5,6 @@
  * 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 akka.actor.ActorSystem;
@@ -17,50 +16,53 @@ import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.osgi.framework.BundleContext;
 
-import java.util.concurrent.atomic.AtomicReference;
-
 public class DistributedDataStoreFactory {
+    private static final String ACTOR_SYSTEM_NAME = "opendaylight-cluster-data";
+    private static final String CONFIGURATION_NAME = "odl-cluster-data";
 
-    public static final String ACTOR_SYSTEM_NAME = "opendaylight-cluster-data";
-
-    public static final String CONFIGURATION_NAME = "odl-cluster-data";
+    private static volatile ActorSystem persistentActorSystem = null;
 
-    private static AtomicReference<ActorSystem> persistentActorSystem = new AtomicReference<>();
+    public static DistributedDataStore createInstance(SchemaService schemaService,
+            DatastoreContext datastoreContext, BundleContext bundleContext) {
 
-    public static DistributedDataStore createInstance(String name, SchemaService schemaService,
-                                                      DatastoreContext datastoreContext, BundleContext bundleContext) {
+        DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
+        DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay(
+                introspector, bundleContext);
 
         ActorSystem actorSystem = getOrCreateInstance(bundleContext, datastoreContext.getConfigurationReader());
         Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
-        final DistributedDataStore dataStore =
-                new DistributedDataStore(actorSystem, name, new ClusterWrapperImpl(actorSystem),
-                        config, datastoreContext);
+        final DistributedDataStore dataStore = new DistributedDataStore(actorSystem,
+                new ClusterWrapperImpl(actorSystem), config, introspector.getContext());
+
+        overlay.setListener(dataStore);
 
         ShardStrategyFactory.setConfiguration(config);
         schemaService.registerSchemaContextListener(dataStore);
+
+        dataStore.setCloseable(overlay);
+        dataStore.waitTillReady();
         return dataStore;
     }
 
-    synchronized private static final ActorSystem getOrCreateInstance(final BundleContext bundleContext, ConfigurationReader configurationReader) {
-
-        AtomicReference<ActorSystem> actorSystemReference = persistentActorSystem;
-        String configurationName = CONFIGURATION_NAME;
-        String actorSystemName = ACTOR_SYSTEM_NAME;
-
-        if (actorSystemReference.get() != null){
-            return actorSystemReference.get();
+    private static final ActorSystem getOrCreateInstance(final BundleContext bundleContext, ConfigurationReader configurationReader) {
+        ActorSystem ret = persistentActorSystem;
+        if (ret == null) {
+            synchronized (DistributedDataStoreFactory.class) {
+                ret = persistentActorSystem;
+                if (ret == null) {
+                    // Create an OSGi bundle classloader for actor system
+                    BundleDelegatingClassLoader classLoader = new BundleDelegatingClassLoader(bundleContext.getBundle(),
+                        Thread.currentThread().getContextClassLoader());
+
+                    ret = ActorSystem.create(ACTOR_SYSTEM_NAME,
+                        ConfigFactory.load(configurationReader.read()).getConfig(CONFIGURATION_NAME), classLoader);
+                    ret.actorOf(Props.create(TerminationMonitor.class), "termination-monitor");
+
+                    persistentActorSystem = ret;
+                }
+            }
         }
 
-        // Create an OSGi bundle classloader for actor system
-        BundleDelegatingClassLoader classLoader = new BundleDelegatingClassLoader(bundleContext.getBundle(),
-                Thread.currentThread().getContextClassLoader());
-
-        ActorSystem system = ActorSystem.create(actorSystemName,
-                ConfigFactory.load(configurationReader.read()).getConfig(configurationName), classLoader);
-        system.actorOf(Props.create(TerminationMonitor.class), "termination-monitor");
-
-        actorSystemReference.set(system);
-        return system;
+        return ret;
     }
-
 }