X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDataTreeChangeListenerSupport.java;h=fa55523db0087467d4919075cbc39abc2a46621b;hp=db5eeb83e70eedd4101cceeabd5491a2c5b3a47e;hb=24c074a4b32ac97980a652b78824b7c2f97ffb78;hpb=2727bea09c83646b6cbd2ef9672d0b7f6cf3b22f

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerSupport.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerSupport.java
index db5eeb83e7..fa55523db0 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerSupport.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerSupport.java
@@ -9,9 +9,7 @@ package org.opendaylight.controller.cluster.datastore;
 
 import akka.actor.ActorRef;
 import akka.actor.ActorSelection;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
+import com.google.common.base.Optional;
 import java.util.Map.Entry;
 import org.opendaylight.controller.cluster.datastore.messages.EnableNotification;
 import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListener;
@@ -19,67 +17,16 @@ import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeCh
 import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-final class DataTreeChangeListenerSupport extends LeaderLocalDelegateFactory<RegisterDataTreeChangeListener, ListenerRegistration<DOMDataTreeChangeListener>, DataTreeCandidate> {
-    private static final Logger LOG = LoggerFactory.getLogger(DataTreeChangeListenerSupport.class);
-    private final ArrayList<DelayedDataTreeListenerRegistration> delayedRegistrations = new ArrayList<>();
-    private final Collection<ActorSelection> actors = new ArrayList<>();
 
+final class DataTreeChangeListenerSupport extends AbstractDataListenerSupport<DOMDataTreeChangeListener,
+        RegisterDataTreeChangeListener, DelayedDataTreeListenerRegistration, ListenerRegistration<DOMDataTreeChangeListener>> {
     DataTreeChangeListenerSupport(final Shard shard) {
         super(shard);
     }
 
     @Override
-    void onLeadershipChange(final boolean isLeader) {
-        if (isLeader) {
-            for (DelayedDataTreeListenerRegistration reg : delayedRegistrations) {
-                reg.createDelegate(this);
-            }
-            delayedRegistrations.clear();
-            delayedRegistrations.trimToSize();
-        }
-
-        final EnableNotification msg = new EnableNotification(isLeader);
-        for (ActorSelection dataChangeListener : actors) {
-            dataChangeListener.tell(msg, getSelf());
-        }
-    }
-
-    @Override
-    void onMessage(final RegisterDataTreeChangeListener registerTreeChangeListener, final boolean isLeader) {
-        LOG.debug("{}: registerTreeChangeListener for {}, leader: {}", persistenceId(), registerTreeChangeListener.getPath(), isLeader);
-
-        final ListenerRegistration<DOMDataTreeChangeListener> registration;
-        final DataTreeCandidate event;
-        if (!isLeader) {
-            LOG.debug("{}: Shard is not the leader - delaying registration", persistenceId());
-
-            DelayedDataTreeListenerRegistration delayedReg =
-                    new DelayedDataTreeListenerRegistration(registerTreeChangeListener);
-            delayedRegistrations.add(delayedReg);
-            registration = delayedReg;
-            event = null;
-        } else {
-            final Entry<ListenerRegistration<DOMDataTreeChangeListener>, DataTreeCandidate> res = createDelegate(registerTreeChangeListener);
-            registration = res.getKey();
-            event = res.getValue();
-        }
-
-        ActorRef listenerRegistration = createActor(DataTreeChangeListenerRegistrationActor.props(registration));
-
-        LOG.debug("{}: registerDataChangeListener sending reply, listenerRegistrationPath = {} ",
-            persistenceId(), listenerRegistration.path());
-
-        tellSender(new RegisterDataTreeChangeListenerReply(listenerRegistration));
-        if (event != null) {
-            registration.getInstance().onDataTreeChanged(Collections.singletonList(event));
-        }
-    }
-
-    @Override
-    Entry<ListenerRegistration<DOMDataTreeChangeListener>, DataTreeCandidate> createDelegate(final RegisterDataTreeChangeListener message) {
+    Entry<ListenerRegistration<DOMDataTreeChangeListener>, Optional<DataTreeCandidate>> createDelegate(
+            final RegisterDataTreeChangeListener message) {
         ActorSelection dataChangeListenerPath = selectActor(message.getDataTreeChangeListenerPath());
 
         // Notify the listener if notifications should be enabled or not
@@ -89,12 +36,40 @@ final class DataTreeChangeListenerSupport extends LeaderLocalDelegateFactory<Reg
 
         // Now store a reference to the data change listener so it can be notified
         // at a later point if notifications should be enabled or disabled
-        actors.add(dataChangeListenerPath);
+        if(!message.isRegisterOnAllInstances()) {
+            addListenerActor(dataChangeListenerPath);
+        }
 
         DOMDataTreeChangeListener listener = new ForwardingDataTreeChangeListener(dataChangeListenerPath);
 
-        LOG.debug("{}: Registering for path {}", persistenceId(), message.getPath());
+        log().debug("{}: Registering for path {}", persistenceId(), message.getPath());
+
+        Entry<ListenerRegistration<DOMDataTreeChangeListener>, Optional<DataTreeCandidate>> regEntry =
+                getShard().getDataStore().registerTreeChangeListener(message.getPath(), listener);
+
+        getShard().getDataStore().notifyOfInitialData(message.getPath(),
+                regEntry.getKey().getInstance(), regEntry.getValue());
+
+        return regEntry;
+    }
+
+    @Override
+    protected DelayedDataTreeListenerRegistration newDelayedListenerRegistration(RegisterDataTreeChangeListener message) {
+        return new DelayedDataTreeListenerRegistration(message);
+    }
+
+    @Override
+    protected ActorRef newRegistrationActor(ListenerRegistration<DOMDataTreeChangeListener> registration) {
+        return createActor(DataTreeChangeListenerRegistrationActor.props(registration));
+    }
+
+    @Override
+    protected Object newRegistrationReplyMessage(ActorRef registrationActor) {
+        return new RegisterDataTreeChangeListenerReply(registrationActor);
+    }
 
-        return getShard().getDataStore().registerTreeChangeListener(message.getPath(), listener);
+    @Override
+    protected String logName() {
+        return "registerTreeChangeListener";
     }
 }