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%2FDataChangeListenerSupport.java;fp=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDataChangeListenerSupport.java;h=c7b55414e6d8b8146cf8f00812860716baebf158;hp=e6f63d7154ba6d5f301ed7fd4b77f111d0ea8034;hb=66a6b6f931af3fcd1ce61263c457304cfbdc2bb5;hpb=5a42510a466d4a251c05aab2afe74563978f40bb

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 e6f63d7154..c7b55414e6 100644
--- 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
@@ -28,42 +28,57 @@ final class DataChangeListenerSupport extends LeaderLocalDelegateFactory<Registe
     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()) {
-                    final Entry<ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier, NormalizedNode<?, ?>>>, DOMImmutableDataChangeEvent> res =
-                            createDelegate(reg.getRegisterChangeListener());
-                    reg.setDelegate(res.getKey());
-                    if (res.getValue() != null) {
-                        reg.getInstance().onDataChanged(res.getValue());
-                    }
-                }
+                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);
 
         final ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier,
                                                      NormalizedNode<?, ?>>> registration;
         final AsyncDataChangeEvent<YangInstanceIdentifier, NormalizedNode<?, ?>> event;
-        if (isLeader) {
+        if ((hasLeader && message.isRegisterOnAllInstances()) || isLeader) {
             final Entry<ListenerRegistration<AsyncDataChangeListener<YangInstanceIdentifier, NormalizedNode<?, ?>>>, DOMImmutableDataChangeEvent> res =
                     createDelegate(message);
             registration = res.getKey();
@@ -72,7 +87,11 @@ final class DataChangeListenerSupport extends LeaderLocalDelegateFactory<Registe
             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;
         }
@@ -100,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);