package org.opendaylight.mdsal.dom.broker;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
import java.util.Collection;
-import java.util.EnumMap;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
+import java.util.Set;
import javax.annotation.concurrent.GuardedBy;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
import org.opendaylight.mdsal.dom.api.DOMDataTreeListener;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeLoopException;
import org.opendaylight.mdsal.dom.api.DOMDataTreeProducer;
import org.opendaylight.mdsal.dom.api.DOMDataTreeService;
import org.opendaylight.mdsal.dom.api.DOMDataTreeShard;
import org.opendaylight.mdsal.dom.api.DOMDataTreeShardingConflictException;
import org.opendaylight.mdsal.dom.api.DOMDataTreeShardingService;
+import org.opendaylight.mdsal.dom.spi.DOMDataTreePrefixTable;
+import org.opendaylight.mdsal.dom.spi.DOMDataTreePrefixTableEntry;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreTreeChangePublisher;
+import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class ShardedDOMDataTree implements DOMDataTreeService, DOMDataTreeShardingService {
private static final Logger LOG = LoggerFactory.getLogger(ShardedDOMDataTree.class);
- private final Map<LogicalDatastoreType, ShardingTableEntry> shardingTables = new EnumMap<>(LogicalDatastoreType.class);
- @GuardedBy("this")
- private final Map<DOMDataTreeIdentifier, DOMDataTreeProducer> idToProducer = new TreeMap<>();
@GuardedBy("this")
- private ShardingTableEntry lookupShard(final DOMDataTreeIdentifier prefix) {
- final ShardingTableEntry t = shardingTables.get(prefix.getDatastoreType());
- if (t == null) {
- return null;
- }
-
- return t.lookup(prefix.getRootIdentifier());
- }
-
+ private final DOMDataTreePrefixTable<ShardRegistration<?>> shards = DOMDataTreePrefixTable.create();
@GuardedBy("this")
- private void storeShard(final DOMDataTreeIdentifier prefix, final ShardRegistration<?> reg) {
- ShardingTableEntry t = shardingTables.get(prefix.getDatastoreType());
- if (t == null) {
- t = new ShardingTableEntry();
- shardingTables.put(prefix.getDatastoreType(), t);
- }
-
- t.store(prefix.getRootIdentifier(), reg);
- }
+ private final DOMDataTreePrefixTable<DOMDataTreeProducer> producers = DOMDataTreePrefixTable.create();
void removeShard(final ShardRegistration<?> reg) {
final DOMDataTreeIdentifier prefix = reg.getPrefix();
final ShardRegistration<?> parentReg;
synchronized (this) {
- final ShardingTableEntry t = shardingTables.get(prefix.getDatastoreType());
- if (t == null) {
- LOG.warn("Shard registration {} points to non-existent table", reg);
- return;
- }
-
- t.remove(prefix.getRootIdentifier());
- parentReg = lookupShard(prefix).getRegistration();
+ shards.remove(prefix);
+ parentReg = shards.lookup(prefix).getValue();
/*
- * FIXME: adjust all producers. This is tricky, as we need different locking strategy,
- * simply because we risk AB/BA deadlock with a producer being split off from
- * a producer.
- *
+ * FIXME: adjust all producers and listeners. This is tricky, as we need different
+ * locking strategy, simply because we risk AB/BA deadlock with a producer being split
+ * off from a producer.
*/
}
}
@Override
- public <T extends DOMDataTreeShard> ListenerRegistration<T> registerDataTreeShard(final DOMDataTreeIdentifier prefix, final T shard) throws DOMDataTreeShardingConflictException {
+ public <T extends DOMDataTreeShard> ListenerRegistration<T> registerDataTreeShard(
+ final DOMDataTreeIdentifier prefix, final T shard, final DOMDataTreeProducer producer)
+ throws DOMDataTreeShardingConflictException {
+
+ final DOMDataTreeIdentifier firstSubtree = Iterables.getOnlyElement(((
+ ShardedDOMDataTreeProducer) producer).getSubtrees());
+ Preconditions.checkArgument(firstSubtree != null, "Producer that is used to verify namespace claim can"
+ + " only claim a single namespace");
+ Preconditions.checkArgument(prefix.equals(firstSubtree), "Trying to register shard to a different namespace"
+ + " than the producer has claimed");
+
final ShardRegistration<T> reg;
final ShardRegistration<?> parentReg;
* and if it exists, check if its registration prefix does not collide with
* this registration.
*/
- final ShardingTableEntry parent = lookupShard(prefix);
+ final DOMDataTreePrefixTableEntry<ShardRegistration<?>> parent = shards.lookup(prefix);
if (parent != null) {
- parentReg = parent.getRegistration();
+ parentReg = parent.getValue();
if (parentReg != null && prefix.equals(parentReg.getPrefix())) {
throw new DOMDataTreeShardingConflictException(String.format(
"Prefix %s is already occupied by shard %s", prefix, parentReg.getInstance()));
reg = new ShardRegistration<T>(this, prefix, shard);
- storeShard(prefix, reg);
+ shards.store(prefix, reg);
- // FIXME: update any producers/registrations
+ ((ShardedDOMDataTreeProducer) producer).subshardAdded(Collections.singletonMap(prefix, shard));
}
// Notify the parent shard
@GuardedBy("this")
private DOMDataTreeProducer findProducer(final DOMDataTreeIdentifier subtree) {
- for (final Entry<DOMDataTreeIdentifier, DOMDataTreeProducer> e : idToProducer.entrySet()) {
- if (e.getKey().contains(subtree)) {
- return e.getValue();
- }
- }
+ final DOMDataTreePrefixTableEntry<DOMDataTreeProducer> producerEntry = producers.lookup(subtree);
+ if (producerEntry != null) {
+ return producerEntry.getValue();
+ }
return null;
}
synchronized void destroyProducer(final ShardedDOMDataTreeProducer producer) {
for (final DOMDataTreeIdentifier s : producer.getSubtrees()) {
- final DOMDataTreeProducer r = idToProducer.remove(s);
- if (!producer.equals(r)) {
- LOG.error("Removed producer {} on subtree {} while removing {}", r, s, producer);
- }
+ producers.remove(s);
}
}
@GuardedBy("this")
- private DOMDataTreeProducer createProducer(final Map<DOMDataTreeIdentifier, DOMDataTreeShard> shardMap) {
+ private DOMDataTreeProducer createProducer(final Collection<DOMDataTreeIdentifier> subtrees,
+ final Map<DOMDataTreeIdentifier, DOMDataTreeShard> shardMap) {
// Record the producer's attachment points
- final DOMDataTreeProducer ret = ShardedDOMDataTreeProducer.create(this, shardMap);
- for (final DOMDataTreeIdentifier s : shardMap.keySet()) {
- idToProducer.put(s, ret);
+ final DOMDataTreeProducer ret = ShardedDOMDataTreeProducer.create(this, subtrees, shardMap);
+ for (final DOMDataTreeIdentifier subtree : subtrees) {
+ producers.store(subtree, ret);
}
return ret;
Preconditions.checkArgument(!subtrees.isEmpty(), "Subtrees may not be empty");
final Map<DOMDataTreeIdentifier, DOMDataTreeShard> shardMap = new HashMap<>();
- for (final DOMDataTreeIdentifier s : subtrees) {
+ for (final DOMDataTreeIdentifier subtree : subtrees) {
// Attempting to create a disconnected producer -- all subtrees have to be unclaimed
- final DOMDataTreeProducer producer = findProducer(s);
- Preconditions.checkArgument(producer == null, "Subtree %s is attached to producer %s", s, producer);
+ final DOMDataTreeProducer producer = findProducer(subtree);
+ Preconditions.checkArgument(producer == null, "Subtree %s is attached to producer %s", subtree, producer);
- shardMap.put(s, lookupShard(s).getRegistration().getInstance());
+ final DOMDataTreePrefixTableEntry<ShardRegistration<?>> possibleShardReg = shards.lookup(subtree);
+ if (possibleShardReg != null && possibleShardReg.getValue() != null) {
+ shardMap.put(subtree, possibleShardReg.getValue().getInstance());
+ }
}
- return createProducer(shardMap);
+ return createProducer(subtrees, shardMap);
}
- synchronized DOMDataTreeProducer createProducer(final ShardedDOMDataTreeProducer parent, final Collection<DOMDataTreeIdentifier> subtrees) {
+ synchronized DOMDataTreeProducer createProducer(final ShardedDOMDataTreeProducer parent,
+ final Collection<DOMDataTreeIdentifier> subtrees) {
Preconditions.checkNotNull(parent);
final Map<DOMDataTreeIdentifier, DOMDataTreeShard> shardMap = new HashMap<>();
for (final DOMDataTreeIdentifier s : subtrees) {
- shardMap.put(s, lookupShard(s).getRegistration().getInstance());
+ shardMap.put(s, shards.lookup(s).getValue().getInstance());
}
- return createProducer(shardMap);
+ return createProducer(subtrees, shardMap);
}
+ @SuppressWarnings("checkstyle:IllegalCatch")
@Override
- public synchronized <T extends DOMDataTreeListener> ListenerRegistration<T> registerListener(final T listener, final Collection<DOMDataTreeIdentifier> subtrees, final boolean allowRxMerges, final Collection<DOMDataTreeProducer> producers) {
- // FIXME Implement this.
- throw new UnsupportedOperationException("Not implemented yet.");
+ public synchronized <T extends DOMDataTreeListener> ListenerRegistration<T> registerListener(final T listener,
+ final Collection<DOMDataTreeIdentifier> subtrees, final boolean allowRxMerges,
+ final Collection<DOMDataTreeProducer> producers) throws DOMDataTreeLoopException {
+ Preconditions.checkNotNull(listener, "listener");
+ Preconditions.checkArgument(!subtrees.isEmpty(), "Subtrees must not be empty.");
+ final ShardedDOMDataTreeListenerContext<T> listenerContext =
+ ShardedDOMDataTreeListenerContext.create(listener, subtrees, allowRxMerges);
+ try {
+ // FIXME: Add attachment of producers
+ for (final DOMDataTreeProducer producer : producers) {
+ Preconditions.checkArgument(producer instanceof ShardedDOMDataTreeProducer);
+ final ShardedDOMDataTreeProducer castedProducer = ((ShardedDOMDataTreeProducer) producer);
+ simpleLoopCheck(subtrees, castedProducer.getSubtrees());
+ // FIXME: We should also unbound listeners
+ castedProducer.boundToListener(listenerContext);
+ }
+
+ for (final DOMDataTreeIdentifier subtree : subtrees) {
+ final DOMDataTreeShard shard = shards.lookup(subtree).getValue().getInstance();
+ // FIXME: What should we do if listener is wildcard? And shards are on per
+ // node basis?
+ Preconditions.checkArgument(shard instanceof DOMStoreTreeChangePublisher,
+ "Subtree %s does not point to listenable subtree.", subtree);
+
+ listenerContext.register(subtree, (DOMStoreTreeChangePublisher) shard);
+ }
+ } catch (final Exception e) {
+ listenerContext.close();
+ throw e;
+ }
+ return new AbstractListenerRegistration<T>(listener) {
+ @Override
+ protected void removeRegistration() {
+ ShardedDOMDataTree.this.removeListener(listenerContext);
+ }
+ };
+ }
+
+ private static void simpleLoopCheck(final Collection<DOMDataTreeIdentifier> listen,
+ final Set<DOMDataTreeIdentifier> writes) throws DOMDataTreeLoopException {
+ for (final DOMDataTreeIdentifier listenPath : listen) {
+ for (final DOMDataTreeIdentifier writePath : writes) {
+ if (listenPath.contains(writePath)) {
+ throw new DOMDataTreeLoopException(String.format(
+ "Listener must not listen on parent (%s), and also writes child (%s)", listenPath,
+ writePath));
+ } else if (writePath.contains(listenPath)) {
+ throw new DOMDataTreeLoopException(
+ String.format("Listener must not write parent (%s), and also listen on child (%s)",
+ writePath, listenPath));
+ }
+ }
+ }
+ }
+
+ void removeListener(final ShardedDOMDataTreeListenerContext<?> listener) {
+ // FIXME: detach producers
+ listener.close();
}
}
Code Review / mdsal.git / blobdiff