X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bgp%2Ftopology-provider%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fbgpcep%2Fbgp%2Ftopology%2Fprovider%2FAbstractReachabilityTopologyBuilder.java;h=2a6b1a6311a418445954c4fa602a137fa3896ddb;hb=804cd520199b1e0299952787027febef349d5980;hp=94c7011ccb1843a6b6f82b4b1503e5592fcbe810;hpb=f7ce6572aa3bd91a377accd9999a4a789a11596b;p=bgpcep.git diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java index 94c7011ccb..2a6b1a6311 100644 --- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java +++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractReachabilityTopologyBuilder.java @@ -8,16 +8,19 @@ package org.opendaylight.bgpcep.bgp.topology.provider; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import java.util.concurrent.ExecutionException; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadTransaction; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.protocol.bgp.rib.RibReference; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.Attributes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.Route; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.route.Attributes; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.CNextHop; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv4NextHopCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.next.hop.c.next.hop.Ipv6NextHopCase; @@ -28,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypesBuilder; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.TopologyTypes; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.Node1; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.Node1Builder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.nt.l3.unicast.igp.topology.rev131021.igp.node.attributes.IgpNodeAttributes; @@ -47,15 +50,28 @@ import org.slf4j.LoggerFactory; */ abstract class AbstractReachabilityTopologyBuilder extends AbstractTopologyBuilder { private static final Logger LOG = LoggerFactory.getLogger(AbstractReachabilityTopologyBuilder.class); + private final Map nodes = new HashMap<>(); + + private static final class NodeUsage { + private final InstanceIdentifier attrId; + private int useCount = 1; + + NodeUsage(final InstanceIdentifier attrId) { + this.attrId = Preconditions.checkNotNull(attrId); + } + } protected AbstractReachabilityTopologyBuilder(final DataBroker dataProvider, final RibReference locRibReference, - final TopologyId topologyId, final Class idClass) { - super(dataProvider, locRibReference, topologyId, new TopologyTypesBuilder().build(), idClass); + final TopologyId topologyId, final TopologyTypes topologyTypes) { + super(dataProvider, locRibReference, topologyId, topologyTypes); } private NodeId advertizingNode(final Attributes attrs) { final CNextHop nh = attrs.getCNextHop(); - if (nh instanceof Ipv4NextHopCase) { + if (nh == null) { + LOG.warn("Next hop value is null"); + return null; + } else if (nh instanceof Ipv4NextHopCase) { final Ipv4NextHop ipv4 = ((Ipv4NextHopCase) nh).getIpv4NextHop(); return new NodeId(ipv4.getGlobal().getValue()); @@ -85,24 +101,23 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst return o.orNull(); } - private InstanceIdentifier ensureNodePresent(final ReadWriteTransaction trans, final NodeId ni) { + private InstanceIdentifier ensureNodePresent(final ReadWriteTransaction trans, final NodeId ni) { + final NodeUsage present = this.nodes.get(ni); + if (present != null) { + return present.attrId; + } + final KeyedInstanceIdentifier nii = nodeInstanceId(ni); - final InstanceIdentifier ret = nii.augmentation(Node1.class); + final InstanceIdentifier ret = nii.builder().augmentation(Node1.class).child(IgpNodeAttributes.class).build(); trans.merge(LogicalDatastoreType.OPERATIONAL, nii, new NodeBuilder().setKey(nii.getKey()).setNodeId(ni) .addAugmentation(Node1.class, new Node1Builder().setIgpNodeAttributes( new IgpNodeAttributesBuilder().setPrefix(Collections.emptyList()).build()).build()).build()); + this.nodes.put(ni, new NodeUsage(ret)); return ret; } - private void removeEmptyNode(final ReadWriteTransaction trans, final InstanceIdentifier nii) { - final IgpNodeAttributes attrs = read(trans, nii.augmentation(Node1.class).child(IgpNodeAttributes.class)); - if (attrs != null && attrs.getPrefix().isEmpty()) { - trans.delete(LogicalDatastoreType.OPERATIONAL, nii); - } - } - protected abstract Attributes getAttributes(final T value); protected abstract IpPrefix getPrefix(final T value); @@ -110,28 +125,50 @@ abstract class AbstractReachabilityTopologyBuilder extends Abst @Override protected final void createObject(final ReadWriteTransaction trans, final InstanceIdentifier id, final T value) { final NodeId ni = advertizingNode(getAttributes(value)); - final InstanceIdentifier nii = ensureNodePresent(trans, ni); + if (ni == null) { + return; + } + final InstanceIdentifier nii = ensureNodePresent(trans, ni); final IpPrefix prefix = getPrefix(value); final PrefixKey pk = new PrefixKey(prefix); trans.put(LogicalDatastoreType.OPERATIONAL, - nii.child(IgpNodeAttributes.class).child( - Prefix.class, pk), new PrefixBuilder().setKey(pk).setPrefix(prefix).build()); + nii.child(Prefix.class, pk), new PrefixBuilder().setKey(pk).setPrefix(prefix).build()); } @Override protected final void removeObject(final ReadWriteTransaction trans, final InstanceIdentifier id, final T value) { final NodeId ni = advertizingNode(getAttributes(value)); - final InstanceIdentifier nii = nodeInstanceId(ni); - - final IpPrefix prefix = getPrefix(value); - final PrefixKey pk = new PrefixKey(prefix); - - trans.delete(LogicalDatastoreType.OPERATIONAL, nii.augmentation(Node1.class).child(IgpNodeAttributes.class).child( - Prefix.class, pk)); - - removeEmptyNode(trans, nii); + if (ni == null) { + return; + } + final NodeUsage present = this.nodes.get(ni); + Preconditions.checkState(present != null, "Removing prefix from non-existent node %s", present); + + final PrefixKey pk = new PrefixKey(getPrefix(value)); + trans.delete(LogicalDatastoreType.OPERATIONAL, present.attrId.child(Prefix.class, pk)); + + /* + * This is optimization magic: we are reading a list and we want to remove it once it + * hits zero. We may be in a transaction, so the read is costly, especially since we + * have just modified the list. + * + * Once we have performed the read, though, we can check the number of nodes, and reuse + * it for that number of removals. Note that since we do not track data and thus have + * no understanding about the difference between replace and add, we do not ever increase + * the life of this in createObject(). + */ + present.useCount--; + if (present.useCount == 0) { + final IgpNodeAttributes attrs = read(trans, present.attrId); + if (attrs != null) { + present.useCount = attrs.getPrefix().size(); + if (present.useCount == 0) { + trans.delete(LogicalDatastoreType.OPERATIONAL, nodeInstanceId(ni)); + this.nodes.remove(ni); + } + } + } } - }