X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bgp%2Frib-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbgp%2Frib%2Fimpl%2FRIBImpl.java;h=26e4be65676181671a3d8d42ae02082fc0761447;hb=e314a29c76a5afacd84f4ef8a38b19abd0273444;hp=3fd2a7731fcbdacd6a6a686e30412daffd72db67;hpb=496eba69cdba49e64e7400978bd8e55544ae3232;p=bgpcep.git diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java index 3fd2a7731f..26e4be6567 100755 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBImpl.java @@ -8,6 +8,11 @@ package org.opendaylight.protocol.bgp.rib.impl; import static java.util.Objects.requireNonNull; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.BGPRIB_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.LOCRIB_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.PEER_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.RIB_NID; +import static org.opendaylight.protocol.bgp.rib.spi.RIBNodeIdentifiers.TABLES_NID; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; @@ -20,21 +25,20 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; -import javax.annotation.Nonnull; -import javax.annotation.concurrent.GuardedBy; -import javax.annotation.concurrent.ThreadSafe; -import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionChain; -import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBrokerExtension; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; +import org.checkerframework.checker.lock.qual.GuardedBy; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.Transaction; +import org.opendaylight.mdsal.binding.api.TransactionChain; +import org.opendaylight.mdsal.binding.api.TransactionChainListener; import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.api.DOMDataBroker; +import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService; +import org.opendaylight.mdsal.dom.api.DOMDataTreeTransaction; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMTransactionChain; +import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; import org.opendaylight.protocol.bgp.mode.api.PathSelectionMode; import org.opendaylight.protocol.bgp.mode.impl.base.BasePathSelectionModeFactory; @@ -43,7 +47,8 @@ import org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher; import org.opendaylight.protocol.bgp.rib.impl.spi.CodecsRegistry; import org.opendaylight.protocol.bgp.rib.impl.spi.RIB; import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContextRegistry; -import org.opendaylight.protocol.bgp.rib.impl.state.BGPRIBStateImpl; +import org.opendaylight.protocol.bgp.rib.impl.spi.RibOutRefresh; +import org.opendaylight.protocol.bgp.rib.impl.state.BGPRibStateImpl; import org.opendaylight.protocol.bgp.rib.spi.BGPPeerTracker; import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext; import org.opendaylight.protocol.bgp.rib.spi.RIBSupport; @@ -51,20 +56,24 @@ import org.opendaylight.protocol.bgp.rib.spi.policy.BGPRibRoutingPolicy; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.BgpTableType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.BgpRib; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.Route; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.Rib; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.RibKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.LocRib; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.Peer; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.BgpId; +import org.opendaylight.yangtools.yang.binding.ChildOf; +import org.opendaylight.yangtools.yang.binding.ChoiceIn; +import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.Identifiable; +import org.opendaylight.yangtools.yang.binding.Identifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; @@ -75,9 +84,9 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@ThreadSafe -public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionChainListener, - SchemaContextListener, AutoCloseable { +// This class is thread-safe +public final class RIBImpl extends BGPRibStateImpl implements RIB, TransactionChainListener, + DOMTransactionChainListener, SchemaContextListener, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(RIBImpl.class); private static final QName RIB_ID_QNAME = QName.create(Rib.QNAME, "id").intern(); @@ -94,7 +103,7 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh private final CodecsRegistryImpl codecsRegistry; private final BGPTableTypeRegistryConsumer tableTypeRegistry; private final DOMDataBrokerExtension domService; - private final Map, LocRibWriter> txChainToLocRibWriter = new HashMap<>(); + private final Map txChainToLocRibWriter = new HashMap<>(); private final Map bestPathSelectionStrategies; private final RibId ribId; private final BGPPeerTracker peerTracker = new BGPPeerTrackerImpl(); @@ -105,6 +114,7 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh private DOMTransactionChain domChain; @GuardedBy("this") private boolean isServiceInstantiated; + private final Map vpnTableRefresher = new HashMap<>(); public RIBImpl( final BGPTableTypeRegistryConsumer tableTypeRegistry, @@ -130,13 +140,13 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh this.localTablesKeys = new HashSet<>(); this.domDataBroker = requireNonNull(domDataBroker); this.dataBroker = requireNonNull(dataBroker); - this.domService = this.domDataBroker.getSupportedExtensions().get(DOMDataTreeChangeService.class); + this.domService = this.domDataBroker.getExtensions().get(DOMDataTreeChangeService.class); this.extensions = requireNonNull(extensions); this.ribPolicies = requireNonNull(ribPolicies); this.codecsRegistry = codecsRegistry; this.ribContextRegistry = RIBSupportContextRegistryImpl.create(extensions, this.codecsRegistry); - final InstanceIdentifierBuilder yangRibIdBuilder = YangInstanceIdentifier.builder().node(BgpRib.QNAME).node(Rib.QNAME); - this.yangRibId = yangRibIdBuilder.nodeWithKey(Rib.QNAME, RIB_ID_QNAME, ribId.getValue()).build(); + this.yangRibId = YangInstanceIdentifier.builder().node(BGPRIB_NID).node(RIB_NID) + .nodeWithKey(Rib.QNAME, RIB_ID_QNAME, ribId.getValue()).build(); this.bestPathSelectionStrategies = requireNonNull(bestPathSelectionStrategies); this.ribId = ribId; @@ -149,13 +159,13 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh private synchronized void startLocRib(final TablesKey key) { LOG.debug("Creating LocRib table for {}", key); // create locRibWriter for each table - final DOMDataWriteTransaction tx = this.domChain.newWriteOnlyTransaction(); + final DOMDataTreeWriteTransaction tx = this.domChain.newWriteOnlyTransaction(); final RIBSupport ribSupport = this.ribContextRegistry.getRIBSupport(key); if (ribSupport != null) { final MapEntryNode emptyTable = ribSupport.emptyTable(); final InstanceIdentifierBuilder tableId = YangInstanceIdentifier - .builder(this.yangRibId.node(LocRib.QNAME).node(Tables.QNAME)).node(emptyTable.getIdentifier()); + .builder(this.yangRibId.node(LOCRIB_NID).node(TABLES_NID)).node(emptyTable.getIdentifier()); tx.put(LogicalDatastoreType.OPERATIONAL, tableId.build(), emptyTable); try { @@ -168,21 +178,22 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh } } - private synchronized void createLocRibWriter(final TablesKey key) { - final RIBSupport ribSupport = this.ribContextRegistry.getRIBSupport(key); + private synchronized , S extends ChildOf, + R extends Route & ChildOf & Identifiable, I extends Identifier> + void createLocRibWriter(final TablesKey key) { + final RIBSupport ribSupport = this.ribContextRegistry.getRIBSupport(key); if (ribSupport == null) { return; } LOG.debug("Creating LocRIB writer for key {}", key); - final BindingTransactionChain txChain = createPeerChain(this); + final TransactionChain txChain = createPeerChain(this); PathSelectionMode pathSelectionStrategy = this.bestPathSelectionStrategies.get(key); if (pathSelectionStrategy == null) { pathSelectionStrategy = BasePathSelectionModeFactory.createBestPathSelectionStrategy(); } - final LocRibWriter locRibWriter = LocRibWriter.create( + final LocRibWriter locRibWriter = LocRibWriter.create( ribSupport, - key, this.tableTypeRegistry.getAfiSafiType(key).get(), txChain, getInstanceIdentifier(), @@ -191,6 +202,7 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh this.ribPolicies, this.peerTracker, pathSelectionStrategy); + this.vpnTableRefresher.put(key, locRibWriter); registerTotalPathCounter(key, locRibWriter); registerTotalPrefixesCounter(key, locRibWriter); this.txChainToLocRibWriter.put(txChain, locRibWriter); @@ -202,7 +214,7 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh } @Override - public synchronized void close() throws Exception { + public synchronized void close() { if (this.registration != null) { this.registration.close(); this.registration = null; @@ -219,7 +231,6 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh return this.bgpIdentifier; } - @Nonnull @Override public Set getLocalTables() { return this.localTables; @@ -231,13 +242,13 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh } @Override - public synchronized void onTransactionChainFailed(final TransactionChain chain, - final AsyncTransaction transaction, final Throwable cause) { + public synchronized void onTransactionChainFailed(final TransactionChain chain, + final Transaction transaction, final Throwable cause) { LOG.error("Broken chain in RIB {} transaction {}", getInstanceIdentifier(), transaction != null ? transaction.getIdentifier() : null, cause); if (this.txChainToLocRibWriter.containsKey(chain)) { final LocRibWriter locRibWriter = this.txChainToLocRibWriter.remove(chain); - final BindingTransactionChain newChain = createPeerChain(this); + final TransactionChain newChain = createPeerChain(this); startLocRib(locRibWriter.getTableKey()); locRibWriter.restart(newChain); this.txChainToLocRibWriter.put(newChain, locRibWriter); @@ -245,7 +256,19 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh } @Override - public void onTransactionChainSuccessful(final TransactionChain chain) { + public synchronized void onTransactionChainFailed(final DOMTransactionChain chain, + final DOMDataTreeTransaction transaction, final Throwable cause) { + LOG.error("Broken chain in RIB {} transaction {}", + getInstanceIdentifier(), transaction != null ? transaction.getIdentifier() : null, cause); + } + + @Override + public void onTransactionChainSuccessful(final TransactionChain chain) { + LOG.info("RIB {} closed successfully", getInstanceIdentifier()); + } + + @Override + public void onTransactionChainSuccessful(final DOMTransactionChain chain) { LOG.info("RIB {} closed successfully", getInstanceIdentifier()); } @@ -269,6 +292,14 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh return this.peerTracker; } + @Override + public void refreshTable(final TablesKey tk, final PeerId peerId) { + final RibOutRefresh table = this.vpnTableRefresher.get(tk); + if (table != null) { + table.refreshTable(tk, peerId); + } + } + @Override public DOMDataTreeChangeService getService() { return (DOMDataTreeChangeService) this.domService; @@ -285,13 +316,13 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh } @Override - public BindingTransactionChain createPeerChain(final TransactionChainListener listener) { - return this.dataBroker.createTransactionChain(listener); + public TransactionChain createPeerChain(final TransactionChainListener listener) { + return this.dataBroker.createMergingTransactionChain(listener); } @Override - public DOMTransactionChain createPeerDOMChain(final TransactionChainListener listener) { - return this.domDataBroker.createTransactionChain(listener); + public DOMTransactionChain createPeerDOMChain(final DOMTransactionChainListener listener) { + return this.domDataBroker.createMergingTransactionChain(listener); } @Override @@ -317,25 +348,24 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh public synchronized void instantiateServiceInstance() { this.isServiceInstantiated = true; setActive(true); - this.domChain = this.domDataBroker.createTransactionChain(this); + this.domChain = this.domDataBroker.createMergingTransactionChain(this); LOG.debug("Instantiating RIB table {} at {}", this.ribId, this.yangRibId); - final ContainerNode bgpRib = Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(BgpRib.QNAME)) - .addChild(ImmutableNodes.mapNodeBuilder(Rib.QNAME).build()).build(); + final ContainerNode bgpRib = Builders.containerBuilder().withNodeIdentifier(BGPRIB_NID) + .addChild(ImmutableNodes.mapNodeBuilder(RIB_NID).build()).build(); final MapEntryNode ribInstance = Builders.mapEntryBuilder().withNodeIdentifier( - new NodeIdentifierWithPredicates(Rib.QNAME, RIB_ID_QNAME, this.ribId.getValue())) + NodeIdentifierWithPredicates.of(Rib.QNAME, RIB_ID_QNAME, this.ribId.getValue())) .addChild(ImmutableNodes.leafNode(RIB_ID_QNAME, this.ribId.getValue())) - .addChild(ImmutableNodes.mapNodeBuilder(Peer.QNAME).build()) - .addChild(Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(LocRib.QNAME)) - .addChild(ImmutableNodes.mapNodeBuilder(Tables.QNAME).build()) + .addChild(ImmutableNodes.mapNodeBuilder(PEER_NID).build()) + .addChild(Builders.containerBuilder().withNodeIdentifier(LOCRIB_NID) + .addChild(ImmutableNodes.mapNodeBuilder(TABLES_NID).build()) .build()).build(); - - final DOMDataWriteTransaction trans = this.domChain.newWriteOnlyTransaction(); + final DOMDataTreeWriteTransaction trans = this.domChain.newWriteOnlyTransaction(); // merge empty BgpRib + Rib, to make sure the top-level parent structure is present - trans.merge(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.builder().node(BgpRib.QNAME).build(), bgpRib); + trans.merge(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.create(BGPRIB_NID), bgpRib); trans.put(LogicalDatastoreType.OPERATIONAL, this.yangRibId, ribInstance); try { @@ -362,7 +392,7 @@ public final class RIBImpl extends BGPRIBStateImpl implements RIB, TransactionCh this.txChainToLocRibWriter.values().forEach(LocRibWriter::close); this.txChainToLocRibWriter.clear(); - final DOMDataWriteTransaction t = this.domChain.newWriteOnlyTransaction(); + final DOMDataTreeWriteTransaction t = this.domChain.newWriteOnlyTransaction(); t.delete(LogicalDatastoreType.OPERATIONAL, getYangRibId()); final FluentFuture cleanFuture = t.commit(); cleanFuture.addCallback(new FutureCallback() {