Bug 4105: Pass ModuleShardConfiguration with CreateShard

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / DataChangeListenerSupport.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerSupport.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerSupport.java
index 939ddf8fad842ac947b427f28a09ee3810f8de42..c7b55414e6d8b8146cf8f00812860716baebf158 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerSupport.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataChangeListenerSupport.java
@@ -7,61 +7,93 @@
  */
 package org.opendaylight.controller.cluster.datastore;
 
-import java.util.ArrayList;
-import java.util.List;
 import akka.actor.ActorRef;
 import akka.actor.ActorSelection;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map.Entry;
 import org.opendaylight.controller.cluster.datastore.messages.EnableNotification;
 import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListener;
 import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListenerReply;
+import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener;
+import org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-final class DataChangeListenerSupport extends LeaderLocalDelegateFactory<RegisterChangeListener, ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier, NormalizedNode<?, ?>>>> {
+final class DataChangeListenerSupport extends LeaderLocalDelegateFactory<RegisterChangeListener, ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier, NormalizedNode<?, ?>>>, DOMImmutableDataChangeEvent> {
     private static final Logger LOG = LoggerFactory.getLogger(DataChangeListenerSupport.class);
     private final List<DelayedListenerRegistration> delayedListenerRegistrations = new ArrayList<>();
     private final List<ActorSelection> dataChangeListeners =  new ArrayList<>();
+    private final List<DelayedListenerRegistration> delayedRegisterOnAllListeners = new ArrayList<>();
 
     DataChangeListenerSupport(final Shard shard) {
         super(shard);
     }
 
     @Override
-    void onLeadershipChange(final boolean isLeader) {
+    void onLeadershipChange(final boolean isLeader, boolean hasLeader) {
+        LOG.debug("onLeadershipChange, isLeader: {}, hasLeader : {}", isLeader, hasLeader);
+
         for (ActorSelection dataChangeListener : dataChangeListeners) {
             dataChangeListener.tell(new EnableNotification(isLeader), getSelf());
         }
 
+        if(hasLeader) {
+            for (DelayedListenerRegistration reg : delayedRegisterOnAllListeners) {
+                registerDelayedListeners(reg);
+            }
+            delayedRegisterOnAllListeners.clear();
+        }
+
         if (isLeader) {
             for (DelayedListenerRegistration reg: delayedListenerRegistrations) {
-                if(!reg.isClosed()) {
-                    reg.setDelegate(createDelegate(reg.getRegisterChangeListener()));
-                }
+                registerDelayedListeners(reg);
             }
 
             delayedListenerRegistrations.clear();
         }
     }
 
+    private void registerDelayedListeners(DelayedListenerRegistration reg) {
+        if(!reg.isClosed()) {
+            final Entry<ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier, NormalizedNode<?, ?>>>, DOMImmutableDataChangeEvent> res =
+                createDelegate(reg.getRegisterChangeListener());
+            reg.setDelegate(res.getKey());
+            if (res.getValue() != null) {
+                reg.getInstance().onDataChanged(res.getValue());
+            }
+        }
+    }
+
     @Override
-    void onMessage(final RegisterChangeListener message, final boolean isLeader) {
+    void onMessage(final RegisterChangeListener message, final boolean isLeader, boolean hasLeader) {
 
-        LOG.debug("{}: registerDataChangeListener for {}, leader: {}", persistenceId(), message.getPath(), isLeader);
+        LOG.debug("{}: registerDataChangeListener for {}, isLeader: {}, hasLeader : {}",
+            persistenceId(), message.getPath(), isLeader, hasLeader);
 
-        ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier,
+        final ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier,
                                                      NormalizedNode<?, ?>>> registration;
-        if (isLeader) {
-            registration = createDelegate(message);
+        final AsyncDataChangeEvent<YangInstanceIdentifier, NormalizedNode<?, ?>> event;
+        if ((hasLeader && message.isRegisterOnAllInstances()) || isLeader) {
+            final Entry<ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier, NormalizedNode<?, ?>>>, DOMImmutableDataChangeEvent> res =
+                    createDelegate(message);
+            registration = res.getKey();
+            event = res.getValue();
         } else {
             LOG.debug("{}: Shard is not the leader - delaying registration", persistenceId());
 
             DelayedListenerRegistration delayedReg = new DelayedListenerRegistration(message);
-            delayedListenerRegistrations.add(delayedReg);
+            if(message.isRegisterOnAllInstances()) {
+                delayedRegisterOnAllListeners.add(delayedReg);
+            } else {
+                delayedListenerRegistrations.add(delayedReg);
+            }
             registration = delayedReg;
+            event = null;
         }
 
         ActorRef listenerRegistration = createActor(DataChangeListenerRegistration.props(registration));
@@ -70,10 +102,13 @@ final class DataChangeListenerSupport extends LeaderLocalDelegateFactory<Registe
                 persistenceId(), listenerRegistration.path());
 
         tellSender(new RegisterChangeListenerReply(listenerRegistration));
+        if (event != null) {
+            registration.getInstance().onDataChanged(event);
+        }
     }
 
     @Override
-    ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier, NormalizedNode<?, ?>>> createDelegate(
+    Entry<ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier, NormalizedNode<?, ?>>>, DOMImmutableDataChangeEvent> createDelegate(
             final RegisterChangeListener message) {
         ActorSelection dataChangeListenerPath = selectActor(message.getDataChangeListenerPath());
 
@@ -84,7 +119,9 @@ final class DataChangeListenerSupport extends LeaderLocalDelegateFactory<Registe
 
         // 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
-        dataChangeListeners.add(dataChangeListenerPath);
+        if(!message.isRegisterOnAllInstances()) {
+            dataChangeListeners.add(dataChangeListenerPath);
+        }
 
         AsyncDataChangeListener<YangInstanceIdentifier, NormalizedNode<?, ?>> listener =
                 new DataChangeListenerProxy(dataChangeListenerPath);