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%2FShardDataTree.java;h=18f0cddf179b2ed010123c6eaf9f65f320314049;hp=fbe699223c3e5fd6c399c7a680d4a48130b6df89;hb=d9ea4400df226eb65c964ab0cb2aa81ee495ba15;hpb=3d460a8bcbc24eeb969319feb9c7bf16bff496c1 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java index fbe699223c..18f0cddf17 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java @@ -7,8 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore; -import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import com.google.common.base.Strings; import java.util.AbstractMap.SimpleEntry; import java.util.HashMap; @@ -18,7 +18,7 @@ import javax.annotation.concurrent.NotThreadSafe; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener; import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener; -import org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent; +import org.opendaylight.controller.md.sal.dom.store.impl.DataChangeListenerRegistration; import org.opendaylight.controller.md.sal.dom.store.impl.ResolveDataChangeEventsTask; import org.opendaylight.controller.md.sal.dom.store.impl.tree.ListenerTree; import org.opendaylight.yangtools.concepts.ListenerRegistration; @@ -42,27 +42,33 @@ import org.slf4j.LoggerFactory; * This class is not part of the API contract and is subject to change at any time. */ @NotThreadSafe -@VisibleForTesting -public final class ShardDataTree extends ShardDataTreeTransactionParent { +public class ShardDataTree extends ShardDataTreeTransactionParent { private static final Logger LOG = LoggerFactory.getLogger(ShardDataTree.class); + private static final YangInstanceIdentifier ROOT_PATH = YangInstanceIdentifier.builder().build(); private static final ShardDataTreeNotificationManager MANAGER = new ShardDataTreeNotificationManager(); private final Map transactionChains = new HashMap<>(); private final ShardDataTreeChangePublisher treeChangePublisher = new ShardDataTreeChangePublisher(); private final ListenerTree listenerTree = ListenerTree.create(); private final TipProducingDataTree dataTree; + private SchemaContext schemaContext; - ShardDataTree(final SchemaContext schemaContext) { + public ShardDataTree(final SchemaContext schemaContext) { dataTree = InMemoryDataTreeFactory.getInstance().create(); - if (schemaContext != null) { - dataTree.setSchemaContext(schemaContext); - } + updateSchemaContext(schemaContext); + } - TipProducingDataTree getDataTree() { + public TipProducingDataTree getDataTree() { return dataTree; } + SchemaContext getSchemaContext() { + return schemaContext; + } + void updateSchemaContext(final SchemaContext schemaContext) { + Preconditions.checkNotNull(schemaContext); + this.schemaContext = schemaContext; dataTree.setSchemaContext(schemaContext); } @@ -86,13 +92,14 @@ public final class ShardDataTree extends ShardDataTreeTransactionParent { ReadWriteShardDataTreeTransaction newReadWriteTransaction(final String txId, final String chainId) { if (Strings.isNullOrEmpty(chainId)) { - return new ReadWriteShardDataTreeTransaction(this, txId, dataTree.takeSnapshot().newModification()); + return new ReadWriteShardDataTreeTransaction(ShardDataTree.this, txId, dataTree.takeSnapshot() + .newModification()); } return ensureTransactionChain(chainId).newReadWriteTransaction(txId); } - void notifyListeners(final DataTreeCandidate candidate) { + public void notifyListeners(final DataTreeCandidate candidate) { LOG.debug("Notifying listeners on candidate {}", candidate); // DataTreeChanges first, as they are more light-weight @@ -102,6 +109,27 @@ public final class ShardDataTree extends ShardDataTreeTransactionParent { ResolveDataChangeEventsTask.create(candidate, listenerTree).resolve(MANAGER); } + void notifyOfInitialData(DataChangeListenerRegistration>> listenerReg, Optional currentState) { + + if(currentState.isPresent()) { + ListenerTree localListenerTree = ListenerTree.create(); + localListenerTree.registerDataChangeListener(listenerReg.getPath(), listenerReg.getInstance(), + listenerReg.getScope()); + + ResolveDataChangeEventsTask.create(currentState.get(), localListenerTree).resolve(MANAGER); + } + } + + void notifyOfInitialData(final YangInstanceIdentifier path, final DOMDataTreeChangeListener listener, + final Optional currentState) { + if(currentState.isPresent()) { + ShardDataTreeChangePublisher localTreeChangePublisher = new ShardDataTreeChangePublisher(); + localTreeChangePublisher.registerTreeChangeListener(path, listener); + localTreeChangePublisher.publishChanges(currentState.get()); + } + } + void closeAllTransactionChains() { for (ShardDataTreeTransactionChain chain : transactionChains.values()) { chain.close(); @@ -115,40 +143,32 @@ public final class ShardDataTree extends ShardDataTreeTransactionParent { if (chain != null) { chain.close(); } else { - LOG.warn("Closing non-existent transaction chain {}", transactionChainId); + LOG.debug("Closing non-existent transaction chain {}", transactionChainId); } } - Entry>>, DOMImmutableDataChangeEvent> registerChangeListener( - final YangInstanceIdentifier path, - final AsyncDataChangeListener> listener, final DataChangeScope scope) { - final ListenerRegistration>> reg = + Entry>>, + Optional> registerChangeListener(final YangInstanceIdentifier path, + final AsyncDataChangeListener> listener, + final DataChangeScope scope) { + final DataChangeListenerRegistration>> reg = listenerTree.registerDataChangeListener(path, listener, scope); - final Optional> currentState = dataTree.takeSnapshot().readNode(path); - final DOMImmutableDataChangeEvent event; - if (currentState.isPresent()) { - final NormalizedNode data = currentState.get(); - event = DOMImmutableDataChangeEvent.builder(DataChangeScope.BASE).setAfter(data).addCreated(path, data).build(); - } else { - event = null; - } + return new SimpleEntry<>(reg, readCurrentData()); + } - return new SimpleEntry<>(reg, event); + private Optional readCurrentData() { + final Optional> currentState = dataTree.takeSnapshot().readNode(ROOT_PATH); + return currentState.isPresent() ? Optional.of(DataTreeCandidates.fromNormalizedNode( + ROOT_PATH, currentState.get())) : Optional.absent(); } - Entry, DataTreeCandidate> registerTreeChangeListener(final YangInstanceIdentifier path, - final DOMDataTreeChangeListener listener) { - final ListenerRegistration reg = treeChangePublisher.registerTreeChangeListener(path, listener); + public Entry, Optional> registerTreeChangeListener( + final YangInstanceIdentifier path, final DOMDataTreeChangeListener listener) { + final ListenerRegistration reg = treeChangePublisher.registerTreeChangeListener( + path, listener); - final Optional> currentState = dataTree.takeSnapshot().readNode(path); - final DataTreeCandidate event; - if (currentState.isPresent()) { - event = DataTreeCandidates.fromNormalizedNode(path, currentState.get()); - } else { - event = null; - } - return new SimpleEntry<>(reg, event); + return new SimpleEntry<>(reg, readCurrentData()); } void applyForeignCandidate(final String identifier, final DataTreeCandidate foreign) throws DataValidationFailedException { @@ -174,7 +194,6 @@ public final class ShardDataTree extends ShardDataTreeTransactionParent { ShardDataTreeCohort finishTransaction(final ReadWriteShardDataTreeTransaction transaction) { final DataTreeModification snapshot = transaction.getSnapshot(); snapshot.ready(); - return new SimpleShardDataTreeCohort(this, snapshot); + return new SimpleShardDataTreeCohort(this, snapshot, transaction.getId()); } - }