From 3d238a5647ee15331849fbe9269e11969229ee5a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 18 Apr 2015 21:26:27 +0200 Subject: [PATCH] BUG-3018: report DataTreeChangeListener initial state Once we have make callout to AbstractDOMStoreTreeChangePublisher, also examine our current state to see if we should report an initial event. Requires https://git.opendaylight.org/gerrit/18583 in yangtools. Change-Id: If6ccdb32057d1cf54bfc83888bf1540142c3ec7f Signed-off-by: Robert Varga --- .../AbstractDOMStoreTreeChangePublisher.java | 5 ++--- .../dom/store/impl/InMemoryDOMDataStore.java | 10 +++++++--- .../InMemoryDOMStoreTreeChangePublisher.java | 20 +++++++++++++++++-- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTreeChangePublisher.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTreeChangePublisher.java index f8ac0d849f..d191fc397c 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTreeChangePublisher.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTreeChangePublisher.java @@ -16,7 +16,6 @@ import org.opendaylight.controller.md.sal.dom.spi.AbstractDOMDataTreeChangeListe import org.opendaylight.controller.md.sal.dom.spi.AbstractRegistrationTree; import org.opendaylight.controller.md.sal.dom.spi.RegistrationTreeNode; import org.opendaylight.controller.md.sal.dom.spi.RegistrationTreeSnapshot; -import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; @@ -43,7 +42,7 @@ public abstract class AbstractDOMStoreTreeChangePublisher extends AbstractRegist /** * Callback notifying the subclass that the specified registration is being closed and it's user no longer - * wishes to receive notifications. This notification is invoked while the {@link ListenerRegistration#close()} + * wishes to receive notifications. This notification is invoked while the {@link org.opendaylight.yangtools.concepts.ListenerRegistration#close()} * method is executing. Subclasses can use this callback to properly remove any delayed notifications pending * towards the registration. * @@ -70,7 +69,7 @@ public abstract class AbstractDOMStoreTreeChangePublisher extends AbstractRegist } @Override - public final ListenerRegistration registerTreeChangeListener(final YangInstanceIdentifier treeId, final L listener) { + public final AbstractDOMDataTreeChangeListenerRegistration registerTreeChangeListener(final YangInstanceIdentifier treeId, final L listener) { // Take the write lock takeLock(); try { diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java index b617a8087f..354abcf69f 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java @@ -205,8 +205,12 @@ public class InMemoryDOMDataStore extends TransactionReadyPrototype implements D } @Override - public ListenerRegistration registerTreeChangeListener(final YangInstanceIdentifier treeId, final L listener) { - return changePublisher.registerTreeChangeListener(treeId, listener); + public synchronized ListenerRegistration registerTreeChangeListener(final YangInstanceIdentifier treeId, final L listener) { + /* + * Make sure commit is not occurring right now. Listener has to be + * registered and its state capture enqueued at a consistent point. + */ + return changePublisher.registerTreeChangeListener(treeId, listener, dataTree.takeSnapshot()); } @Override @@ -224,7 +228,7 @@ public class InMemoryDOMDataStore extends TransactionReadyPrototype implements D return name + "-" + txCounter.getAndIncrement(); } - private static void warnDebugContext(AbstractDOMStoreTransaction transaction) { + private static void warnDebugContext(final AbstractDOMStoreTransaction transaction) { final Throwable ctx = transaction.getDebugContext(); if (ctx != null) { LOG.warn("Transaction {} has been allocated in the following context", transaction.getIdentifier(), ctx); diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java index feb1b66dd3..2f3b46366a 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java @@ -7,6 +7,7 @@ */ package org.opendaylight.controller.md.sal.dom.store.impl; +import com.google.common.base.Optional; import java.util.Collection; import java.util.Collections; import java.util.concurrent.ExecutorService; @@ -14,12 +15,15 @@ import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener; import org.opendaylight.controller.md.sal.dom.spi.AbstractDOMDataTreeChangeListenerRegistration; import org.opendaylight.controller.sal.core.spi.data.AbstractDOMStoreTreeChangePublisher; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager; import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager.Invoker; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.DefaultDataTreeCandidate; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidates; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,7 +48,7 @@ final class InMemoryDOMStoreTreeChangePublisher extends AbstractDOMStoreTreeChan @Override protected void notifyListeners(final Collection> registrations, final YangInstanceIdentifier path, final DataTreeCandidateNode node) { - final DataTreeCandidate candidate = new DefaultDataTreeCandidate(path, node); + final DataTreeCandidate candidate = DataTreeCandidates.newDataTreeCandidate(path, node); for (AbstractDOMDataTreeChangeListenerRegistration reg : registrations) { LOG.debug("Enqueueing candidate {} to registration {}", candidate, registrations); @@ -59,6 +63,18 @@ final class InMemoryDOMStoreTreeChangePublisher extends AbstractDOMStoreTreeChan // FIXME: remove the queue for this registration and make sure we clear it } + ListenerRegistration registerTreeChangeListener(final YangInstanceIdentifier treeId, final L listener, final DataTreeSnapshot snapshot) { + final AbstractDOMDataTreeChangeListenerRegistration reg = registerTreeChangeListener(treeId, listener); + + final Optional> node = snapshot.readNode(treeId); + if (node.isPresent()) { + final DataTreeCandidate candidate = DataTreeCandidates.fromNormalizedNode(treeId, node.get()); + notificationManager.submitNotification(reg, candidate); + } + + return reg; + } + synchronized void publishChange(@Nonnull final DataTreeCandidate candidate) { // Runs synchronized with registrationRemoved() processCandidateTree(candidate); -- 2.36.6