import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
+import com.google.common.collect.ImmutableClassToInstanceMap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-import com.google.common.net.InetAddresses;
import com.google.common.util.concurrent.FluentFuture;
+import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.checkerframework.checker.lock.qual.Holding;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.mdsal.binding.api.Transaction;
-import org.opendaylight.mdsal.binding.api.TransactionChain;
import org.opendaylight.mdsal.common.api.CommitInfo;
-import org.opendaylight.mdsal.dom.api.DOMDataTreeTransaction;
-import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer;
import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
import org.opendaylight.protocol.bgp.parser.BGPError;
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.multiprotocol.rev180329.RouteRefresh;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.SendReceive;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.attributes.reach.MpReachNlri;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.attributes.reach.MpReachNlriBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.attributes.reach.mp.reach.nlri.AdvertizedRoutesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.attributes.unreach.MpUnreachNlri;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.attributes.unreach.MpUnreachNlriBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.attributes.unreach.mp.unreach.nlri.WithdrawnRoutesBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.GracefulRestartCapability;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.add.path.capability.AddressFamilies;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlriBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpUnreachNlri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpUnreachNlriBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.mp.reach.nlri.AdvertizedRoutesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.mp.unreach.nlri.WithdrawnRoutesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.peer.rpc.rev180329.BgpPeerRpcService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.peer.rpc.rev180329.ResetSession;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.peer.rpc.rev180329.RestartGracefully;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.peer.rpc.rev180329.RouteRefreshRequest;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerRole;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.PeerKey;
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.types.rev200120.AddressFamily;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.ClusterIdentifier;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv4AddressFamily;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.RouteTarget;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.SubsequentAddressFamily;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.UnicastSubsequentAddressFamily;
-import org.opendaylight.yangtools.concepts.ObjectRegistration;
import org.opendaylight.yangtools.concepts.Registration;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.Notification;
+import org.opendaylight.yangtools.yang.binding.Rpc;
+import org.opendaylight.yangtools.yang.common.Empty;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
import org.slf4j.Logger;
*/
public class BGPPeer extends AbstractPeer implements BGPSessionListener {
private static final Logger LOG = LoggerFactory.getLogger(BGPPeer.class);
- private static final TablesKey IPV4_UCAST_TABLE_KEY = new TablesKey(Ipv4AddressFamily.class,
- UnicastSubsequentAddressFamily.class);
+ private static final TablesKey IPV4_UCAST_TABLE_KEY =
+ new TablesKey(Ipv4AddressFamily.VALUE, UnicastSubsequentAddressFamily.VALUE);
+ private final RIB rib;
+
+ // FIXME: Alright, this right here is a ton of state which has intertwined initialization and dependencies Split
+ // these out into separate behavior objects. This also has relationship with state in AbstractPeer -- which
+ // hints at an obvious layer of indirection. Yeah, yeah, we can always add one of those, but the point
+ // is that this class is a mutable meeting point, whereas the behaviour has captured invariants.
private final LoadingCache<NodeIdentifierWithPredicates, YangInstanceIdentifier> tablesIId =
CacheBuilder.newBuilder().build(new CacheLoader<NodeIdentifierWithPredicates, YangInstanceIdentifier>() {
@Override
});
private ImmutableSet<TablesKey> tables = ImmutableSet.of();
- private final RIB rib;
private final Map<TablesKey, AdjRibOutListener> adjRibOutListenerSet = new HashMap<>();
private final List<RouteTarget> rtMemberships = new ArrayList<>();
private final RpcProviderService rpcRegistry;
private final BGPTableTypeRegistryConsumer tableTypeRegistry;
private final BgpPeer bgpPeer;
+ // FIXME: This should be a constant co-located with ApplicationPeer.peerId
private YangInstanceIdentifier peerRibOutIId;
@GuardedBy("this")
private Registration trackerRegistration;
private AdjRibInWriter ribWriter;
@GuardedBy("this")
private EffectiveRibInWriter effRibInWriter;
- private ObjectRegistration<BgpPeerRpcService> rpcRegistration;
- private Map<TablesKey, SendReceive> addPathTableMaps = Collections.emptyMap();
+ private Registration rpcRegistration;
+ private ImmutableMap<TablesKey, SendReceive> addPathTableMaps = ImmutableMap.of();
+ // FIXME: This should be a constant co-located with ApplicationPeer.peerId
private YangInstanceIdentifier peerPath;
+ // FIXME: This is for supportsTable() -- a trivial behavior thing, where 'peer-down' type states always return false
private boolean sessionUp;
private boolean llgrSupport;
private Stopwatch peerRestartStopwatch;
final List<Ipv4Prefixes> prefixes = message.getNlri().stream()
.map(n -> new Ipv4PrefixesBuilder().setPrefix(n.getPrefix()).setPathId(n.getPathId()).build())
.collect(Collectors.toList());
- final MpReachNlriBuilder b = new MpReachNlriBuilder().setAfi(Ipv4AddressFamily.class).setSafi(
- UnicastSubsequentAddressFamily.class).setAdvertizedRoutes(
- new AdvertizedRoutesBuilder().setDestinationType(
- new DestinationIpv4CaseBuilder().setDestinationIpv4(
- new DestinationIpv4Builder().setIpv4Prefixes(prefixes).build()).build()).build());
+ final MpReachNlriBuilder b = new MpReachNlriBuilder()
+ .setAfi(Ipv4AddressFamily.VALUE)
+ .setSafi(UnicastSubsequentAddressFamily.VALUE)
+ .setAdvertizedRoutes(new AdvertizedRoutesBuilder()
+ .setDestinationType(new DestinationIpv4CaseBuilder()
+ .setDestinationIpv4(new DestinationIpv4Builder().setIpv4Prefixes(prefixes).build())
+ .build())
+ .build());
if (message.getAttributes() != null) {
b.setCNextHop(message.getAttributes().getCNextHop());
}
prefixes.add(new Ipv4PrefixesBuilder().setPrefix(w.getPrefix()).setPathId(w.getPathId()).build());
}
});
- return new MpUnreachNlriBuilder().setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class)
+ return new MpUnreachNlriBuilder().setAfi(Ipv4AddressFamily.VALUE).setSafi(UnicastSubsequentAddressFamily.VALUE)
.setWithdrawnRoutes(new WithdrawnRoutesBuilder().setDestinationType(new org.opendaylight.yang.gen.v1
.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.update.attributes.mp.unreach.nlri
.withdrawn.routes.destination.type.DestinationIpv4CaseBuilder().setDestinationIpv4(
new DestinationIpv4Builder().setIpv4Prefixes(prefixes).build()).build()).build()).build();
}
- private static Map<TablesKey, SendReceive> mapTableTypesFamilies(final List<AddressFamilies> addPathTablesType) {
+ private static ImmutableMap<TablesKey, SendReceive> mapTableTypesFamilies(
+ final List<AddressFamilies> addPathTablesType) {
return addPathTablesType.stream().collect(ImmutableMap.toImmutableMap(
af -> new TablesKey(af.getAfi(), af.getSafi()), BgpAddPathTableType::getSendReceive));
}
public synchronized void instantiateServiceInstance() {
createDomChain();
- this.ribWriter = AdjRibInWriter.create(this.rib.getYangRibId(), this.peerRole, this);
+ ribWriter = AdjRibInWriter.create(rib.getYangRibId(), getRole(), this);
setActive(true);
}
}
@Override
- public void onMessage(final BGPSession session, final Notification msg) throws BGPDocumentedException {
- if (msg instanceof Update) {
- onUpdateMessage((Update) msg);
- } else if (msg instanceof RouteRefresh) {
- onRouteRefreshMessage((RouteRefresh) msg);
+ public void onMessage(final BGPSession session, final Notification<?> msg) throws BGPDocumentedException {
+ if (msg instanceof Update update) {
+ onUpdateMessage(update);
+ } else if (msg instanceof RouteRefresh routeRefresh) {
+ onRouteRefreshMessage(routeRefresh);
} else {
LOG.info("Ignoring unhandled message class {}", msg.getClass());
}
}
private void onRouteRefreshMessage(final RouteRefresh message) {
- final Class<? extends AddressFamily> rrAfi = message.getAfi();
- final Class<? extends SubsequentAddressFamily> rrSafi = message.getSafi();
+ final var rrAfi = message.getAfi();
+ final var rrSafi = message.getSafi();
final TablesKey key = new TablesKey(rrAfi, rrSafi);
synchronized (this) {
- final AdjRibOutListener listener = this.adjRibOutListenerSet.remove(key);
+ final AdjRibOutListener listener = adjRibOutListenerSet.remove(key);
if (listener != null) {
listener.close();
createAdjRibOutListener(key, listener.isMpSupported());
private void checkMandatoryAttributesPresence(final Update message) throws BGPDocumentedException {
if (MessageUtil.isAnyNlriPresent(message)) {
final Attributes attrs = message.getAttributes();
- if (this.peerRole == PeerRole.Ibgp && (attrs == null || attrs.getLocalPref() == null)) {
+ if (getRole() == PeerRole.Ibgp && (attrs == null || attrs.getLocalPref() == null)) {
throw new BGPDocumentedException(BGPError.MANDATORY_ATTR_MISSING_MSG + "LOCAL_PREF",
BGPError.WELL_KNOWN_ATTR_MISSING,
new byte[]{LocalPreferenceAttributeParser.TYPE});
mpReach = MessageUtil.getMpReachNlri(attrs);
}
if (mpReach != null) {
- this.ribWriter.updateRoutes(mpReach, nextHopToAttribute(attrs, mpReach));
+ ribWriter.updateRoutes(mpReach, nextHopToAttribute(attrs, mpReach));
}
final MpUnreachNlri mpUnreach;
if (message.getWithdrawnRoutes() != null) {
if (mpUnreach != null) {
if (endOfRib) {
final TablesKey tablesKey = new TablesKey(mpUnreach.getAfi(), mpUnreach.getSafi());
- this.ribWriter.removeStaleRoutes(tablesKey);
- this.missingEOT.remove(tablesKey);
+ ribWriter.removeStaleRoutes(tablesKey);
+ missingEOT.remove(tablesKey);
handleGracefulEndOfRib();
} else {
- this.ribWriter.removeRoutes(mpUnreach);
+ ribWriter.removeRoutes(mpUnreach);
}
} else if (endOfRib) {
- this.ribWriter.removeStaleRoutes(IPV4_UCAST_TABLE_KEY);
- this.missingEOT.remove(IPV4_UCAST_TABLE_KEY);
+ ribWriter.removeStaleRoutes(IPV4_UCAST_TABLE_KEY);
+ missingEOT.remove(IPV4_UCAST_TABLE_KEY);
handleGracefulEndOfRib();
}
}
@Holding("this")
private void handleGracefulEndOfRib() {
if (isLocalRestarting()) {
- if (this.missingEOT.isEmpty()) {
+ if (missingEOT.isEmpty()) {
createEffRibInWriter();
- this.effRibInWriter.init();
- registerPrefixesCounters(this.effRibInWriter, this.effRibInWriter);
+ effRibInWriter.init();
+ registerPrefixesCounters(effRibInWriter, effRibInWriter);
for (final TablesKey key : getAfiSafisAdvertized()) {
createAdjRibOutListener(key, true);
}
@Override
public synchronized void onSessionUp(final BGPSession session) {
- this.currentSession = session;
- this.sessionUp = true;
- this.bindingChain = this.rib.createPeerChain(this);
- if (this.currentSession instanceof BGPSessionStateProvider) {
- ((BGPSessionStateProvider) this.currentSession).registerMessagesCounter(this);
+ currentSession = session;
+ sessionUp = true;
+
+ final var chain = rib.createPeerDOMChain();
+ ribOutChain = chain;
+ chain.addCallback(new FutureCallback<Empty>() {
+ @Override
+ public void onSuccess(final Empty result) {
+ LOG.debug("RibOut transaction chain {} successful.", chain);
+ }
+
+ @Override
+ public void onFailure(final Throwable cause) {
+ onRibOutChainFailed(cause);
+ }
+ });
+
+ if (currentSession instanceof BGPSessionStateProvider stateProvider) {
+ stateProvider.registerMessagesCounter(this);
}
final GracefulRestartCapability advertisedGracefulRestartCapability =
session.getAdvertisedGracefulRestartCapability();
final List<AddressFamilies> addPathTablesType = session.getAdvertisedAddPathTableTypes();
final Set<BgpTableType> advertizedTableTypes = session.getAdvertisedTableTypes();
- LOG.info("Session with peer {} went up with tables {} and Add Path tables {}", this.name,
+ LOG.info("Session with peer {} went up with tables {} and Add Path tables {}", getName(),
advertizedTableTypes, addPathTablesType);
final Set<TablesKey> setTables = advertizedTableTypes.stream().map(t -> new TablesKey(t.getAfi(), t.getSafi()))
.collect(Collectors.toSet());
- this.tables = ImmutableSet.copyOf(setTables);
+ tables = ImmutableSet.copyOf(setTables);
- this.addPathTableMaps = mapTableTypesFamilies(addPathTablesType);
+ addPathTableMaps = mapTableTypesFamilies(addPathTablesType);
final boolean restartingLocally = isLocalRestarting();
if (!restartingLocally) {
addBgp4Support();
}
if (!isRestartingGracefully()) {
- this.rawIdentifier = InetAddresses.forString(session.getBgpId().getValue()).getAddress();
- this.peerId = RouterIds.createPeerId(session.getBgpId());
+ peerId = RouterIds.createPeerId(session.getBgpId());
final KeyedInstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib
.rev180329.bgp.rib.rib.Peer, PeerKey> peerIId = getInstanceIdentifier().child(org.opendaylight.yang.gen
.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.Peer.class,
- new PeerKey(this.peerId));
- this.peerPath = createPeerPath();
- this.peerRibOutIId = peerPath.node(ADJRIBOUT_NID);
- this.trackerRegistration = this.rib.getPeerTracker().registerPeer(this);
+ new PeerKey(peerId));
+ peerPath = createPeerPath(peerId);
+ peerRibOutIId = peerPath.node(ADJRIBOUT_NID);
+ trackerRegistration = rib.getPeerTracker().registerPeer(this);
createEffRibInWriter();
- registerPrefixesCounters(this.effRibInWriter, this.effRibInWriter);
-
- this.effRibInWriter.init();
- this.ribWriter = this.ribWriter.transform(this.peerId, this.peerPath, this.rib.getRibSupportContext(),
- this.tables, this.addPathTableMaps);
-
- if (this.rpcRegistry != null) {
- this.rpcRegistration = this.rpcRegistry.registerRpcImplementation(BgpPeerRpcService.class,
- new BgpPeerRpc(this, session, this.tables), ImmutableSet.of(this.rib.getInstanceIdentifier().child(
+ registerPrefixesCounters(effRibInWriter, effRibInWriter);
+
+ effRibInWriter.init();
+ ribWriter = ribWriter.transform(peerId, peerPath, rib.getRibSupportContext(),
+ tables, addPathTableMaps);
+
+ if (rpcRegistry != null) {
+ final var bgpPeerHandler = new BgpPeerRpc(this, session, tables);
+ rpcRegistration = rpcRegistry.registerRpcImplementations(
+ ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
+ .put(ResetSession.class, bgpPeerHandler::resetSession)
+ .put(RestartGracefully.class, bgpPeerHandler::restartGracefully)
+ .put(RouteRefreshRequest.class, bgpPeerHandler::routeRefreshRequest)
+ .build(),
+ ImmutableSet.of(rib.getInstanceIdentifier().child(
org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib
- .Peer.class, new PeerKey(this.peerId))));
+ .Peer.class, new PeerKey(peerId))));
}
} else {
final Set<TablesKey> forwardingTables;
.map(table -> new TablesKey(table.getAfi(), table.getSafi()))
.collect(Collectors.toSet());
}
- this.ribWriter.clearTables(Sets.difference(this.tables, forwardingTables));
+ ribWriter.clearTables(Sets.difference(tables, forwardingTables));
if (restartingLocally) {
- this.effRibInWriter.close();
- this.peerRestartStopwatch = Stopwatch.createStarted();
+ effRibInWriter.close();
+ peerRestartStopwatch = Stopwatch.createStarted();
handleSelectionReferralTimer();
- this.missingEOT.addAll(this.tables);
+ missingEOT.addAll(tables);
}
}
if (advertisedTables == null || advertisedTables.isEmpty()) {
}
// SpotBugs does not grok Optional.ifPresent() and thinks we are using unsynchronized access
- final Optional<RevisedErrorHandlingSupport> errorHandling = this.bgpPeer.getErrorHandling();
+ final Optional<RevisedErrorHandlingSupport> errorHandling = bgpPeer.getErrorHandling();
if (errorHandling.isPresent()) {
- this.currentSession.addDecoderConstraint(RevisedErrorHandlingSupport.class, errorHandling.get());
+ currentSession.addDecoderConstraint(RevisedErrorHandlingSupport.class, errorHandling.orElseThrow());
}
}
}
private synchronized void createEffRibInWriter() {
- this.effRibInWriter = new EffectiveRibInWriter(this, this.rib,
- this.rib.createPeerDOMChain(this),
- this.peerPath, this.tables, this.tableTypeRegistry,
- this.rtMemberships,
- this.rtCache);
+ final var chain = rib.createPeerDOMChain();
+ chain.addCallback(this);
+
+ effRibInWriter = new EffectiveRibInWriter(this, rib, chain, peerPath, tables, tableTypeRegistry, rtMemberships,
+ rtCache);
}
//try to add a support for old-school BGP-4, if peer did not advertise IPv4-Unicast MP capability
@Holding("this")
private void addBgp4Support() {
- if (!this.tables.contains(IPV4_UCAST_TABLE_KEY)) {
- final HashSet<TablesKey> newSet = new HashSet<>(this.tables);
+ if (!tables.contains(IPV4_UCAST_TABLE_KEY)) {
+ final HashSet<TablesKey> newSet = new HashSet<>(tables);
newSet.add(IPV4_UCAST_TABLE_KEY);
- this.tables = ImmutableSet.copyOf(newSet);
+ tables = ImmutableSet.copyOf(newSet);
}
}
@Holding("this")
private void createAdjRibOutListener(final TablesKey key, final boolean mpSupport) {
- final RIBSupport<?, ?, ?, ?> ribSupport = this.rib.getRibSupportContext().getRIBSupport(key);
+ final RIBSupport<?, ?> ribSupport = rib.getRibSupportContext().getRIBSupport(key);
// not particularly nice
- if (ribSupport != null && this.currentSession instanceof BGPSessionImpl) {
- final ChannelOutputLimiter limiter = ((BGPSessionImpl) this.currentSession).getLimiter();
- final AdjRibOutListener adjRibOut = AdjRibOutListener.create(this.peerId, key,
- this.rib.getYangRibId(), this.rib.getCodecsRegistry(), ribSupport,
- this.rib.getService(), limiter, mpSupport);
- this.adjRibOutListenerSet.put(key, adjRibOut);
+ if (ribSupport != null && currentSession instanceof BGPSessionImpl bgpSession) {
+ final AdjRibOutListener adjRibOut = AdjRibOutListener.create(peerId, rib.getYangRibId(),
+ rib.getCodecsRegistry(), ribSupport, rib.getService(), bgpSession.getLimiter(), mpSupport);
+ adjRibOutListenerSet.put(key, adjRibOut);
registerPrefixesSentCounter(key, adjRibOut);
}
}
@Override
public synchronized void onSessionDown(final BGPSession session, final Exception exc) {
if (exc.getMessage().equals(BGPSessionImpl.END_OF_INPUT)) {
- LOG.info("Session with peer {} went down", this.name);
+ LOG.info("Session with peer {} went down", getName());
} else {
- LOG.info("Session with peer {} went down", this.name, exc);
+ LOG.info("Session with peer {} went down", getName(), exc);
}
releaseConnectionGracefully();
}
@Override
public synchronized void onSessionTerminated(final BGPSession session, final BGPTerminationReason cause) {
- LOG.info("Session with peer {} terminated: {}", this.name, cause);
+ LOG.info("Session with peer {} terminated: {}", getName(), cause);
releaseConnectionGracefully();
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("name", this.name).add("tables", this.tables).toString();
+ return MoreObjects.toStringHelper(this).add("name", getName()).add("tables", tables).toString();
}
@Override
@Holding("this")
private @NonNull FluentFuture<? extends CommitInfo> releaseConnection(final boolean isWaitForSubmitted) {
LOG.info("Closing session with peer");
- this.sessionUp = false;
- this.adjRibOutListenerSet.values().forEach(AdjRibOutListener::close);
- this.adjRibOutListenerSet.clear();
+ sessionUp = false;
+ adjRibOutListenerSet.values().forEach(AdjRibOutListener::close);
+ adjRibOutListenerSet.clear();
final FluentFuture<? extends CommitInfo> future;
- if (!isRestartingGracefully()) {
- future = terminateConnection();
- } else {
+ // FIXME: this is a typical example of something which should be handled by a behavior into which we have
+ // transitioned way before this method is called. This really begs to be an abstract base class with
+ // a 'clearTables' or similar callout
+ if (isRestartingGracefully()) {
final Set<TablesKey> gracefulTables = getGracefulTables();
- this.ribWriter.storeStaleRoutes(gracefulTables);
- future = this.ribWriter.clearTables(Sets.difference(this.tables, gracefulTables));
+ ribWriter.storeStaleRoutes(gracefulTables);
+ future = ribWriter.clearTables(Sets.difference(tables, gracefulTables));
if (isPeerRestarting()) {
- this.peerRestartStopwatch = Stopwatch.createStarted();
+ peerRestartStopwatch = Stopwatch.createStarted();
handleRestartTimer();
}
+ } else {
+ future = terminateConnection();
}
- releaseBindingChain(isWaitForSubmitted);
+ releaseRibOutChain(isWaitForSubmitted);
closeSession();
return future;
@Holding("this")
@SuppressWarnings("checkstyle:illegalCatch")
private void closeSession() {
- if (this.currentSession != null) {
+ if (currentSession != null) {
try {
if (isRestartingGracefully()) {
- this.currentSession.closeWithoutMessage();
+ currentSession.closeWithoutMessage();
} else {
- this.currentSession.close();
+ currentSession.close();
}
} catch (final Exception e) {
LOG.warn("Error closing session with peer", e);
}
- this.currentSession = null;
+ currentSession = null;
}
}
private Set<TablesKey> getGracefulTables() {
- return this.tables.stream()
+ return tables.stream()
.filter(this::isGracefulRestartReceived)
.filter(this::isGracefulRestartAdvertized)
.collect(Collectors.toSet());
}
private synchronized FluentFuture<? extends CommitInfo> terminateConnection() {
- final FluentFuture<? extends CommitInfo> future;
- if (this.trackerRegistration != null) {
- this.trackerRegistration.close();
- this.trackerRegistration = null;
+ if (trackerRegistration != null) {
+ trackerRegistration.close();
+ trackerRegistration = null;
}
- if (this.rpcRegistration != null) {
- this.rpcRegistration.close();
+ if (rpcRegistration != null) {
+ rpcRegistration.close();
}
- this.ribWriter.releaseChain();
+ ribWriter.releaseChain();
- if (this.effRibInWriter != null) {
- this.effRibInWriter.close();
+ if (effRibInWriter != null) {
+ effRibInWriter.close();
}
- this.tables = ImmutableSet.of();
- this.addPathTableMaps = Collections.emptyMap();
- future = removePeer(this.peerPath);
+ tables = ImmutableSet.of();
+ addPathTableMaps = ImmutableMap.of();
+ final var future = removePeer(peerPath);
resetState();
return future;
}
final long peerRestartTimeNanos = TimeUnit.SECONDS.toNanos(getPeerRestartTime());
- final long elapsedNanos = this.peerRestartStopwatch.elapsed(TimeUnit.NANOSECONDS);
+ final long elapsedNanos = peerRestartStopwatch.elapsed(TimeUnit.NANOSECONDS);
if (elapsedNanos >= peerRestartTimeNanos) {
setAfiSafiGracefulRestartState(0, false, false);
- onSessionTerminated(this.currentSession, new BGPTerminationReason(BGPError.HOLD_TIMER_EXPIRED));
+ onSessionTerminated(currentSession, new BGPTerminationReason(BGPError.HOLD_TIMER_EXPIRED));
}
currentSession.schedule(this::handleRestartTimer, peerRestartTimeNanos - elapsedNanos, TimeUnit.NANOSECONDS);
return;
}
- final long referalTimerNanos = TimeUnit.SECONDS.toNanos(this.currentSelectionDeferralTimerSeconds);
- final long elapsedNanos = this.peerRestartStopwatch.elapsed(TimeUnit.NANOSECONDS);
+ final long referalTimerNanos = TimeUnit.SECONDS.toNanos(currentSelectionDeferralTimerSeconds);
+ final long elapsedNanos = peerRestartStopwatch.elapsed(TimeUnit.NANOSECONDS);
if (elapsedNanos >= referalTimerNanos) {
- this.missingEOT.clear();
+ missingEOT.clear();
handleGracefulEndOfRib();
}
currentSession.schedule(this::handleSelectionReferralTimer, referalTimerNanos - elapsedNanos,
@SuppressFBWarnings("IS2_INCONSISTENT_SYNC")
@Override
public SendReceive getSupportedAddPathTables(final TablesKey tableKey) {
- return this.addPathTableMaps.get(tableKey);
+ return addPathTableMaps.get(tableKey);
}
@Override
public boolean supportsTable(final TablesKey tableKey) {
- return this.sessionUp && getAfiSafisAdvertized().contains(tableKey) && this.tables.contains(tableKey);
+ return sessionUp && getAfiSafisAdvertized().contains(tableKey) && tables.contains(tableKey);
}
@Override
public YangInstanceIdentifier getRibOutIId(final NodeIdentifierWithPredicates tablekey) {
- return this.tablesIId.getUnchecked(tablekey);
+ return tablesIId.getUnchecked(tablekey);
}
@Override
- public synchronized void onTransactionChainFailed(final DOMTransactionChain chain,
- final DOMDataTreeTransaction transaction, final Throwable cause) {
+ public synchronized void onFailure(final Throwable cause) {
LOG.error("Transaction domChain failed.", cause);
releaseConnection(true);
}
- @Override
- public synchronized void onTransactionChainFailed(final TransactionChain chain, final Transaction transaction,
- final Throwable cause) {
- LOG.error("Transaction domChain failed.", cause);
+ private synchronized void onRibOutChainFailed(final Throwable cause) {
+ LOG.error("RibOut transaction chain failed.", cause);
releaseConnection(false);
}
@Override
public synchronized void markUptodate(final TablesKey tablesKey) {
- this.ribWriter.markTableUptodate(tablesKey);
+ ribWriter.markTableUptodate(tablesKey);
}
@Override
public synchronized BGPSessionState getBGPSessionState() {
- if (this.currentSession instanceof BGPSessionStateProvider) {
- return ((BGPSessionStateProvider) this.currentSession).getBGPSessionState();
+ if (currentSession instanceof BGPSessionStateProvider stateProvider) {
+ return stateProvider.getBGPSessionState();
}
return null;
}
@Override
public synchronized BGPTimersState getBGPTimersState() {
- if (this.currentSession instanceof BGPSessionStateProvider) {
- return ((BGPSessionStateProvider) this.currentSession).getBGPTimersState();
+ if (currentSession instanceof BGPSessionStateProvider stateProvider) {
+ return stateProvider.getBGPTimersState();
}
return null;
}
@Override
public synchronized BGPTransportState getBGPTransportState() {
- if (this.currentSession instanceof BGPSessionStateProvider) {
- return ((BGPSessionStateProvider) this.currentSession).getBGPTransportState();
+ if (currentSession instanceof BGPSessionStateProvider stateProvider) {
+ return stateProvider.getBGPTransportState();
}
return null;
}
@Override
public List<RouteTarget> getMemberships() {
- return this.rtMemberships;
+ return rtMemberships;
}
@Override
public synchronized ListenableFuture<?> restartGracefully(final long selectionDeferralTimerSeconds) {
final Set<TablesKey> tablesToPreserve = getGracefulTables();
if (tablesToPreserve == null || tablesToPreserve.isEmpty()) {
- LOG.info("Peer {} is not capable of graceful restart or have no matching graceful tables.", this.peerId);
+ LOG.info("Peer {} is not capable of graceful restart or have no matching graceful tables.", peerId);
return Futures.immediateFailedFuture(new UnsupportedOperationException(
"Peer is not capable of graceful restart"));
}
setGracefulPreferences(true, tablesToPreserve);
- this.currentSelectionDeferralTimerSeconds = selectionDeferralTimerSeconds;
+ currentSelectionDeferralTimerSeconds = selectionDeferralTimerSeconds;
setLocalRestartingState(true);
return releaseConnection(true);
}
@Override
boolean supportsLLGR() {
- return this.llgrSupport;
+ return llgrSupport;
}
private synchronized void setGracefulPreferences(final boolean localRestarting,
final Set<TablesKey> preservedTables) {
- final Set<TablesKey> gracefulTables = this.tables.stream()
+ final Set<TablesKey> gracefulTables = tables.stream()
.filter(this::isGracefulRestartAdvertized)
.collect(Collectors.toSet());
final BgpParameters bgpParameters = GracefulRestartUtil.getGracefulBgpParameters(
- this.bgpPeer.getBgpFixedCapabilities(), gracefulTables, preservedTables,
- this.bgpPeer.getGracefulRestartTimer(), localRestarting, Collections.emptySet());
- final BGPSessionPreferences oldPrefs = this.rib.getDispatcher().getBGPPeerRegistry()
+ bgpPeer.getBgpFixedCapabilities(), gracefulTables, preservedTables,
+ bgpPeer.getGracefulRestartTimer(), localRestarting, Collections.emptySet());
+ final BGPSessionPreferences oldPrefs = rib.getDispatcher().getBGPPeerRegistry()
.getPeerPreferences(getNeighborAddress());
final BGPSessionPreferences newPrefs = new BGPSessionPreferences(
oldPrefs.getMyAs(),
oldPrefs.getExpectedRemoteAs(),
Collections.singletonList(bgpParameters),
oldPrefs.getMd5Password());
- this.rib.getDispatcher().getBGPPeerRegistry()
+ rib.getDispatcher().getBGPPeerRegistry()
.updatePeerPreferences(getNeighborAddress(), newPrefs);
}
}
Code Review / bgpcep.git / blobdiff