summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
010261c)
The ForwardingDataTreeChangeListener is created when a shard
registers new listener. It then sends dataTreeChanges to said listener
but doesn't specify the sender. The RootListenerActor however needs
to know which shard produced the DataTreeChanged message.
Signed-off-by: Tibor Král <tibor.kral@pantheon.tech>
Change-Id: I4971cfaefa10c3136e0ddcc350ec7e00e68e6b42
void doRegistration(final RegisterDataTreeChangeListener message, final ActorRef registrationActor) {
final ActorSelection listenerActor = processListenerRegistrationMessage(message);
void doRegistration(final RegisterDataTreeChangeListener message, final ActorRef registrationActor) {
final ActorSelection listenerActor = processListenerRegistrationMessage(message);
- final DOMDataTreeChangeListener listener = new ForwardingDataTreeChangeListener(listenerActor);
+ final DOMDataTreeChangeListener listener = new ForwardingDataTreeChangeListener(listenerActor, getSelf());
LOG.debug("{}: Registering listenerActor {} for path {}", persistenceId(), listenerActor, message.getPath());
LOG.debug("{}: Registering listenerActor {} for path {}", persistenceId(), listenerActor, message.getPath());
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
import java.util.Collection;
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
import java.util.Collection;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged;
import org.opendaylight.controller.cluster.datastore.messages.OnInitialData;
import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged;
import org.opendaylight.controller.cluster.datastore.messages.OnInitialData;
import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
private static final Logger LOG = LoggerFactory.getLogger(ForwardingDataTreeChangeListener.class);
private final ActorSelection actor;
private static final Logger LOG = LoggerFactory.getLogger(ForwardingDataTreeChangeListener.class);
private final ActorSelection actor;
+ private final ActorRef sendingActor;
- ForwardingDataTreeChangeListener(final ActorSelection actor) {
+ ForwardingDataTreeChangeListener(final ActorSelection actor, @Nullable final ActorRef sendingActor) {
this.actor = requireNonNull(actor, "actor should not be null");
this.actor = requireNonNull(actor, "actor should not be null");
+ this.sendingActor = sendingActor;
}
@Override
public void onDataTreeChanged(final Collection<DataTreeCandidate> changes) {
LOG.debug("Sending DataTreeChanged to {}", actor);
}
@Override
public void onDataTreeChanged(final Collection<DataTreeCandidate> changes) {
LOG.debug("Sending DataTreeChanged to {}", actor);
- actor.tell(new DataTreeChanged(changes), ActorRef.noSender());
+ actor.tell(new DataTreeChanged(changes), sendingActor);
}
@Override
public void onInitialData() {
LOG.debug("Sending OnInitialData to {}", actor);
}
@Override
public void onInitialData() {
LOG.debug("Sending OnInitialData to {}", actor);
- actor.tell(OnInitialData.INSTANCE, ActorRef.noSender());
+ actor.tell(OnInitialData.INSTANCE, sendingActor);
}
@Override
public String toString() {
}
@Override
public String toString() {
- return "ForwardingDataTreeChangeListener [actor=" + actor + "]";
+ return "ForwardingDataTreeChangeListener [actor=" + actor
+ + ", sending actor=" + (sendingActor != null ? sendingActor : "NO_SENDER") + "]";
final ActorRef actorRef = getSystem().actorOf(MessageCollectorActor.props());
ForwardingDataTreeChangeListener forwardingListener = new ForwardingDataTreeChangeListener(
final ActorRef actorRef = getSystem().actorOf(MessageCollectorActor.props());
ForwardingDataTreeChangeListener forwardingListener = new ForwardingDataTreeChangeListener(
- getSystem().actorSelection(actorRef.path()));
+ getSystem().actorSelection(actorRef.path()), ActorRef.noSender());
Collection<DataTreeCandidate> expected = Arrays.asList(Mockito.mock(DataTreeCandidate.class));
forwardingListener.onDataTreeChanged(expected);
Collection<DataTreeCandidate> expected = Arrays.asList(Mockito.mock(DataTreeCandidate.class));
forwardingListener.onDataTreeChanged(expected);