Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Deprecate CloseTransaction protobuff message
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DistributedDataStoreFactory.java
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 e5aa33a0f4caa98495178eb8f842a9f5e8c89904..211465a35b7f8e53fee6eaf11ef4d13266a2f557 100644
(file)
--- 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,6
+10,7
@@
package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorSystem;
import org.opendaylight.controller.cluster.datastore.config.Configuration;
import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl;
import akka.actor.ActorSystem;
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.slf4j.Logger;
import org.opendaylight.controller.sal.core.api.model.SchemaService;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
@@
-19,9
+20,10
@@
public class DistributedDataStoreFactory {
private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStoreFactory.class);
public static DistributedDataStore createInstance(SchemaService schemaService,
private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStoreFactory.class);
public static DistributedDataStore createInstance(SchemaService schemaService,
- DatastoreContext datastoreContext, ActorSystem actorSystem, BundleContext bundleContext) {
+ DatastoreContext datastoreContext, DatastoreSnapshot restoreFromSnapshot, ActorSystem actorSystem,
+ BundleContext bundleContext) {
- LOG.info("Create data store instance of type : {}", datastoreContext.getDataStore
Typ
e());
+ LOG.info("Create data store instance of type : {}", datastoreContext.getDataStore
Nam
e());
DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay(
DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
DatastoreContextConfigAdminOverlay overlay = new DatastoreContextConfigAdminOverlay(
@@
-29,7
+31,7
@@
public class DistributedDataStoreFactory {
Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
final DistributedDataStore dataStore = new DistributedDataStore(actorSystem,
Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
final DistributedDataStore dataStore = new DistributedDataStore(actorSystem,
- new ClusterWrapperImpl(actorSystem), config, introspector.newContextFactory());
+ new ClusterWrapperImpl(actorSystem), config, introspector.newContextFactory()
, restoreFromSnapshot
);
overlay.setListener(dataStore);
overlay.setListener(dataStore);