From de85a9278e9bf40831803e537d724a6d2bdfac34 Mon Sep 17 00:00:00 2001 From: Ajay Lele Date: Mon, 2 Dec 2019 19:17:53 -0800 Subject: [PATCH] Register PCEP session to stats handler only after it is fully initialized JIRA: BGPCEP-889 Change-Id: I008418426061d51fd3bef1be7e2fca9b63c99100 Signed-off-by: Ajay Lele --- .../spi/pojo/SimplePCEPExtensionProviderContextActivator.java | 2 +- .../pcep/topology/provider/AbstractTopologySessionListener.java | 2 +- .../pcep/topology/stats/provider/TopologyStatsProviderImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java index ed4a7d73a9..06d3a0eb79 100644 --- a/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java +++ b/pcep/spi/src/main/java/org/opendaylight/protocol/pcep/spi/pojo/SimplePCEPExtensionProviderContextActivator.java @@ -42,7 +42,7 @@ public class SimplePCEPExtensionProviderContextActivator implements AutoCloseabl @Override public void close() { - LOG.debug("Stopping {} BGPExtensionProviderActivator instances", this.extensionActivators.size()); + LOG.debug("Stopping {} PCEPExtensionProviderActivator instances", this.extensionActivators.size()); for (final PCEPExtensionProviderActivator e : this.extensionActivators) { e.stop(); diff --git a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java index ccdab8a7fd..86588e0c31 100755 --- a/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java +++ b/pcep/topology/topology-provider/src/main/java/org/opendaylight/bgpcep/pcep/topology/provider/AbstractTopologySessionListener.java @@ -153,7 +153,6 @@ public abstract class AbstractTopologySessionListener implements TopologyS } this.session = psession; this.nodeState = state; - this.serverSessionManager.bind(this.nodeState.getNodeId(), this.listenerState); LOG.trace("Peer {} resolved to topology node {}", peerAddress, state.getNodeId()); @@ -176,6 +175,7 @@ public abstract class AbstractTopologySessionListener implements TopologyS state.storeNode(topologyAugment, new Node1Builder().setPathComputationClient(pccBuilder.build()).build(), this.session); this.listenerState.init(psession); + this.serverSessionManager.bind(this.nodeState.getNodeId(), this.listenerState); LOG.info("Session with {} attached to topology node {}", psession.getRemoteAddress(), state.getNodeId()); } diff --git a/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java b/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java index 6aaac4560e..6f87680839 100644 --- a/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java +++ b/pcep/topology/topology-stats/src/main/java/org/opendaylight/bgpcep/pcep/topology/stats/provider/TopologyStatsProviderImpl.java @@ -100,7 +100,7 @@ public final class TopologyStatsProviderImpl implements TransactionChainListener } }, MoreExecutors.directExecutor()); } catch (final Exception e) { - LOG.warn("Failed to prepare Tx for BGP stats update", e); + LOG.warn("Failed to prepare Tx for PCEP stats update", e); tx.cancel(); } } -- 2.36.6