Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 7521: Convert Snapshot to store a State instance
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DataTreeChangeListenerProxy.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxy.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxy.java
index 124724b9c20c410760e43402b0f6958d5e7c9f9c..8a9b466b6ef6deed0b6db3f01ac34dc933ba58f8 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxy.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxy.java
@@
-11,6
+11,7
@@
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
import akka.actor.PoisonPill;
import akka.dispatch.OnComplete;
import akka.actor.ActorSelection;
import akka.actor.PoisonPill;
import akka.dispatch.OnComplete;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import javax.annotation.concurrent.GuardedBy;
import org.opendaylight.controller.cluster.datastore.exceptions.LocalShardNotFoundException;
import com.google.common.base.Preconditions;
import javax.annotation.concurrent.GuardedBy;
import org.opendaylight.controller.cluster.datastore.exceptions.LocalShardNotFoundException;
@@
-18,6
+19,7
@@
import org.opendaylight.controller.cluster.datastore.messages.CloseDataTreeChang
import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListener;
import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListenerReply;
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListener;
import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListenerReply;
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
+import org.opendaylight.controller.md.sal.dom.api.ClusteredDOMDataTreeChangeListener;
import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener;
import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener;
import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@
-39,11
+41,12
@@
final class DataTreeChangeListenerProxy<T extends DOMDataTreeChangeListener> ext
@GuardedBy("this")
private ActorSelection listenerRegistrationActor;
@GuardedBy("this")
private ActorSelection listenerRegistrationActor;
-
public
DataTreeChangeListenerProxy(final ActorContext actorContext, final T listener) {
+ DataTreeChangeListenerProxy(final ActorContext actorContext, final T listener) {
super(listener);
this.actorContext = Preconditions.checkNotNull(actorContext);
this.dataChangeListenerActor = actorContext.getActorSystem().actorOf(
super(listener);
this.actorContext = Preconditions.checkNotNull(actorContext);
this.dataChangeListenerActor = actorContext.getActorSystem().actorOf(
- DataTreeChangeListenerActor.props(getInstance()).withDispatcher(actorContext.getNotificationDispatcherPath()));
+ DataTreeChangeListenerActor.props(getInstance())
+ .withDispatcher(actorContext.getNotificationDispatcherPath()));
}
@Override
}
@Override
@@
-62,11
+65,11
@@
final class DataTreeChangeListenerProxy<T extends DOMDataTreeChangeListener> ext
@Override
public void onComplete(final Throwable failure, final ActorRef shard) {
if (failure instanceof LocalShardNotFoundException) {
@Override
public void onComplete(final Throwable failure, final ActorRef shard) {
if (failure instanceof LocalShardNotFoundException) {
- LOG.debug("No local shard found for {} - DataTreeChangeListener {} at path {} "
+
- "cannot be registered", shardName, getInstance(), treeId);
+ LOG.debug("No local shard found for {} - DataTreeChangeListener {} at path {} "
+
+
"cannot be registered", shardName, getInstance(), treeId);
} else if (failure != null) {
} else if (failure != null) {
- LOG.error("Failed to find local shard {} - DataTreeChangeListener {} at path {} "
+
- "cannot be registered: {}", shardName, getInstance(), treeId, failure);
+ LOG.error("Failed to find local shard {} - DataTreeChangeListener {} at path {} "
+
+
"cannot be registered: {}", shardName, getInstance(), treeId, failure);
} else {
doRegistration(shard, treeId);
}
} else {
doRegistration(shard, treeId);
}
@@
-94,10
+97,11
@@
final class DataTreeChangeListenerProxy<T extends DOMDataTreeChangeListener> ext
private void doRegistration(final ActorRef shard, final YangInstanceIdentifier path) {
Future<Object> future = actorContext.executeOperationAsync(shard,
private void doRegistration(final ActorRef shard, final YangInstanceIdentifier path) {
Future<Object> future = actorContext.executeOperationAsync(shard,
- new RegisterDataTreeChangeListener(path, dataChangeListenerActor),
+ new RegisterDataTreeChangeListener(path, dataChangeListenerActor,
+ getInstance() instanceof ClusteredDOMDataTreeChangeListener),
actorContext.getDatastoreContext().getShardInitializationTimeout());
actorContext.getDatastoreContext().getShardInitializationTimeout());
- future.onComplete(new OnComplete<Object>(){
+ future.onComplete(new OnComplete<Object>()
{
@Override
public void onComplete(final Throwable failure, final Object result) {
if (failure != null) {
@Override
public void onComplete(final Throwable failure, final Object result) {
if (failure != null) {
@@
-106,9
+110,19
@@
final class DataTreeChangeListenerProxy<T extends DOMDataTreeChangeListener> ext
} else {
RegisterDataTreeChangeListenerReply reply = (RegisterDataTreeChangeListenerReply) result;
setListenerRegistrationActor(actorContext.actorSelection(
} else {
RegisterDataTreeChangeListenerReply reply = (RegisterDataTreeChangeListenerReply) result;
setListenerRegistrationActor(actorContext.actorSelection(
- reply.getListenerRegistrationPath()
.path()
));
+ reply.getListenerRegistrationPath()));
}
}
}, actorContext.getClientDispatcher());
}
}
}
}, actorContext.getClientDispatcher());
}
+
+ @VisibleForTesting
+ synchronized ActorSelection getListenerRegistrationActor() {
+ return listenerRegistrationActor;
+ }
+
+ @VisibleForTesting
+ ActorRef getDataChangeListenerActor() {
+ return dataChangeListenerActor;
+ }
}
}