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;
-public class DistributedDataStoreFactory {
+public final class DistributedDataStoreFactory {
+
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";
- /**
- * 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 initialDatastoreContext, final DatastoreSnapshotRestore datastoreSnapshotRestore,
- final ActorSystemProvider actorSystemProvider, final BundleContext bundleContext) {
+ private DistributedDataStoreFactory() {
+ }
- 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 DatastoreContextIntrospector introspector,
+ final DatastoreContextPropertiesUpdater updater) {
+ return createInstance(schemaService, initialDatastoreContext, datastoreSnapshotRestore, actorSystemProvider,
+ introspector, updater, null);
}
+ // 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 BundleContext bundleContext) {
+ final ActorSystemProvider actorSystemProvider, final DatastoreContextIntrospector introspector,
+ final DatastoreContextPropertiesUpdater updater, final Configuration orgConfig) {
+
+ final AbstractDataStore dataStore = createInstance(actorSystemProvider, initialDatastoreContext,
+ introspector, datastoreSnapshotRestore, orgConfig);
+
+ updater.setListener(dataStore);
+
+ schemaService.registerSchemaContextListener(dataStore);
+
+ 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);
- final DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(initialDatastoreContext);
- final DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay(
- introspector, bundleContext);
+ final DatastoreSnapshot restoreFromSnapshot = datastoreSnapshotRestore.getAndRemove(datastoreName).orElse(null);
- final Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
+ 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();
LOG.info("Data store {} is using ask-based protocol", datastoreName);
}
- overlay.setListener(dataStore);
-
- schemaService.registerSchemaContextListener(dataStore);
-
- dataStore.setCloseable(overlay);
- dataStore.waitTillReady();
-
return dataStore;
}
}