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=ee8ac61ecf6da73a410a1ebc87315389dd715d42;hp=a9a735ede78de6e31e92fb2f638e6a793e1f2480;hb=daaef05cbf70e6cbec9af181258faead6d9620a6;hpb=bbaba878c38f381b0b924f89b29a1d0fcf6e2a2f

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 a9a735ede7..ee8ac61ecf 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
@@ -10,51 +10,85 @@ package org.opendaylight.controller.cluster.datastore;
 import akka.actor.ActorSystem;
 import akka.actor.Props;
 import akka.osgi.BundleDelegatingClassLoader;
+import com.google.common.base.Preconditions;
 import com.typesafe.config.ConfigFactory;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.cluster.datastore.config.ConfigurationReader;
 import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import scala.concurrent.duration.Duration;
 
 public class DistributedDataStoreFactory {
     private static final String ACTOR_SYSTEM_NAME = "opendaylight-cluster-data";
     private static final String CONFIGURATION_NAME = "odl-cluster-data";
+    private static ActorSystem actorSystem = null;
+    private static final Set<DistributedDataStore> createdInstances = new HashSet<>(2);
+    private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStoreFactory.class);
 
-    private static volatile ActorSystem persistentActorSystem = null;
+    public static synchronized DistributedDataStore createInstance(SchemaService schemaService,
+            DatastoreContext datastoreContext, BundleContext bundleContext) {
 
-    public static DistributedDataStore createInstance(SchemaService schemaService,
-                                                      DatastoreContext datastoreContext, BundleContext bundleContext) {
+        LOG.info("Create data store instance of type : {}", datastoreContext.getDataStoreType());
 
-        ActorSystem actorSystem = getOrCreateInstance(bundleContext, datastoreContext.getConfigurationReader());
+        DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
+        DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay(
+                introspector, bundleContext);
+
+        ActorSystem actorSystem = getActorSystem(bundleContext, datastoreContext.getConfigurationReader());
         Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
-        final DistributedDataStore dataStore =
-                new DistributedDataStore(actorSystem, 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();
+
+        createdInstances.add(dataStore);
         return dataStore;
     }
 
-    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;
+    private static synchronized final ActorSystem getActorSystem(final BundleContext bundleContext,
+                                                                 ConfigurationReader configurationReader) {
+        if (actorSystem == null) {
+            // Create an OSGi bundle classloader for actor system
+            BundleDelegatingClassLoader classLoader = new BundleDelegatingClassLoader(bundleContext.getBundle(),
+                Thread.currentThread().getContextClassLoader());
+
+            actorSystem = ActorSystem.create(ACTOR_SYSTEM_NAME,
+                ConfigFactory.load(configurationReader.read()).getConfig(CONFIGURATION_NAME), classLoader);
+            actorSystem.actorOf(Props.create(TerminationMonitor.class), "termination-monitor");
+        }
+
+        return actorSystem;
+    }
+
+    public static synchronized void destroyInstance(DistributedDataStore dataStore){
+        Preconditions.checkNotNull(dataStore, "dataStore should not be null");
+
+        LOG.info("Destroy data store instance of type : {}", dataStore.getActorContext().getDataStoreType());
+
+        if(createdInstances.remove(dataStore)){
+            if(createdInstances.size() == 0){
+                if(actorSystem != null) {
+                    actorSystem.shutdown();
+                    try {
+                        actorSystem.awaitTermination(Duration.create(10, TimeUnit.SECONDS));
+                    } catch (Exception e) {
+                        LOG.warn("Error awaiting actor termination", e);
+                    }
+                    actorSystem = null;
                 }
             }
         }
-
-        return ret;
     }
+
 }