Register PCEP session to stats handler only after it is fully initialized

JIRA: BGPCEP-889
Change-Id: I008418426061d51fd3bef1be7e2fca9b63c99100
Signed-off-by: Ajay Lele <ajayslele@gmail.com>

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 ed4a7d73a9981d3967da92c28ecbd7ae0e5de2a2..06d3a0eb795c158b4801a1063ecd011fc610da93 100644 (file)
--- 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 f4026048853321e35de5644a56ba6db56110ae61..ace52d5dbaf986da4e7b55c6ac8fafa756a8ff35 100755 (executable)
--- 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
@@ -151,7 +151,6 @@ public abstract class AbstractTopologySessionListener<S, L> 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());
 
@@ -174,6 +173,7 @@ public abstract class AbstractTopologySessionListener<S, L> 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 d3ff3eef50c8d5738b765bb256bf1b144e6c7bb5..e17c5fae7b3291658c525c8eb2cd6e9858fb719e 100644 (file)
--- 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
@@ -97,7 +97,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();
         }
     }