Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix to karaf-parent to copy in dependencies."
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ShardManager.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java
index 3dbac003b9d66b74520d431c2d7ebb45da488fbc..775cae35e22843cafd223bce22eb5232a230868f 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardManager.java
@@
-39,7
+39,6
@@
import org.opendaylight.controller.cluster.common.actor.AbstractUntypedPersisten
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardManagerIdentifier;
import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shardmanager.ShardManagerInfo;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardManagerIdentifier;
import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shardmanager.ShardManagerInfo;
-import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shardmanager.ShardManagerInfoMBean;
import org.opendaylight.controller.cluster.datastore.messages.ActorInitialized;
import org.opendaylight.controller.cluster.datastore.messages.ActorNotInitialized;
import org.opendaylight.controller.cluster.datastore.messages.FindLocalShard;
import org.opendaylight.controller.cluster.datastore.messages.ActorInitialized;
import org.opendaylight.controller.cluster.datastore.messages.ActorNotInitialized;
import org.opendaylight.controller.cluster.datastore.messages.FindLocalShard;
@@
-50,6
+49,7
@@
import org.opendaylight.controller.cluster.datastore.messages.PeerAddressResolve
import org.opendaylight.controller.cluster.datastore.messages.PrimaryFound;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryNotFound;
import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryFound;
import org.opendaylight.controller.cluster.datastore.messages.PrimaryNotFound;
import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext;
+import org.opendaylight.controller.cluster.datastore.utils.Dispatchers;
import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.slf4j.Logger;
import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.slf4j.Logger;
@@
-87,9
+87,11
@@
public class ShardManager extends AbstractUntypedPersistentActorWithMetering {
private final Configuration configuration;
private final Configuration configuration;
- private
ShardManagerInfoMBean mBean
;
+ private
final String shardDispatcherPath
;
- private final DatastoreContext datastoreContext;
+ private ShardManagerInfo mBean;
+
+ private DatastoreContext datastoreContext;
private Collection<String> knownModules = Collections.emptySet();
private Collection<String> knownModules = Collections.emptySet();
@@
-105,6
+107,8
@@
public class ShardManager extends AbstractUntypedPersistentActorWithMetering {
this.datastoreContext = datastoreContext;
this.dataPersistenceProvider = createDataPersistenceProvider(datastoreContext.isPersistent());
this.type = datastoreContext.getDataStoreType();
this.datastoreContext = datastoreContext;
this.dataPersistenceProvider = createDataPersistenceProvider(datastoreContext.isPersistent());
this.type = datastoreContext.getDataStoreType();
+ this.shardDispatcherPath =
+ new Dispatchers(context().system().dispatchers()).getDispatcherPath(Dispatchers.DispatcherType.Shard);
// Subscribe this actor to cluster member events
cluster.subscribeToMemberEvents(getSelf());
// Subscribe this actor to cluster member events
cluster.subscribeToMemberEvents(getSelf());
@@
-127,6
+131,13
@@
public class ShardManager extends AbstractUntypedPersistentActorWithMetering {
return Props.create(new ShardManagerCreator(cluster, configuration, datastoreContext));
}
return Props.create(new ShardManagerCreator(cluster, configuration, datastoreContext));
}
+ @Override
+ public void postStop() {
+ LOG.info("Stopping ShardManager");
+
+ mBean.unregisterMBean();
+ }
+
@Override
public void handleCommand(Object message) throws Exception {
if (message.getClass().equals(FindPrimary.SERIALIZABLE_CLASS)) {
@Override
public void handleCommand(Object message) throws Exception {
if (message.getClass().equals(FindPrimary.SERIALIZABLE_CLASS)) {
@@
-143,6
+154,8
@@
public class ShardManager extends AbstractUntypedPersistentActorWithMetering {
memberRemoved((ClusterEvent.MemberRemoved) message);
} else if(message instanceof ClusterEvent.UnreachableMember) {
ignoreMessage(message);
memberRemoved((ClusterEvent.MemberRemoved) message);
} else if(message instanceof ClusterEvent.UnreachableMember) {
ignoreMessage(message);
+ } else if(message instanceof DatastoreContext) {
+ onDatastoreContext((DatastoreContext)message);
} else{
unknownMessage(message);
}
} else{
unknownMessage(message);
}
@@
-253,6
+266,15
@@
public class ShardManager extends AbstractUntypedPersistentActorWithMetering {
}
}
}
}
+ private void onDatastoreContext(DatastoreContext context) {
+ datastoreContext = context;
+ for (ShardInformation info : localShards.values()) {
+ if (info.getActor() != null) {
+ info.getActor().tell(datastoreContext, getSelf());
+ }
+ }
+ }
+
/**
* Notifies all the local shards of a change in the schema context
*
/**
* Notifies all the local shards of a change in the schema context
*
@@
-271,7
+293,7
@@
public class ShardManager extends AbstractUntypedPersistentActorWithMetering {
if(newModules.containsAll(knownModules)) {
if(newModules.containsAll(knownModules)) {
- LOG.
info
("New SchemaContext has a super set of current knownModules - persisting info");
+ LOG.
debug
("New SchemaContext has a super set of current knownModules - persisting info");
knownModules = ImmutableSet.copyOf(newModules);
knownModules = ImmutableSet.copyOf(newModules);
@@
-279,12
+301,12
@@
public class ShardManager extends AbstractUntypedPersistentActorWithMetering {
@Override
public void apply(SchemaContextModules param) throws Exception {
@Override
public void apply(SchemaContextModules param) throws Exception {
- LOG.
info
("Sending new SchemaContext to Shards");
+ LOG.
debug
("Sending new SchemaContext to Shards");
for (ShardInformation info : localShards.values()) {
if (info.getActor() == null) {
info.setActor(getContext().actorOf(Shard.props(info.getShardId(),
for (ShardInformation info : localShards.values()) {
if (info.getActor() == null) {
info.setActor(getContext().actorOf(Shard.props(info.getShardId(),
- info.getPeerAddresses(), datastoreContext, schemaContext)
,
- info.getShardId().toString()));
+ info.getPeerAddresses(), datastoreContext, schemaContext)
+
.withDispatcher(shardDispatcherPath),
info.getShardId().toString()));
} else {
info.getActor().tell(message, getSelf());
}
} else {
info.getActor().tell(message, getSelf());
}
@@
-293,7
+315,8
@@
public class ShardManager extends AbstractUntypedPersistentActorWithMetering {
});
} else {
});
} else {
- LOG.info("Rejecting schema context update because it is not a super set of previously known modules");
+ LOG.debug("Rejecting schema context update - not a super set of previously known modules:\nUPDATE: {}\nKNOWN: {}",
+ newModules, knownModules);
}
}
}
}