Instantiate BgpPeer only once

For some reason in clustered configuration BgpPeer might be instantiated
twice and this leads to service failure, this patch introduce additional
check to avoid this.

JIRA: BGPCEP-948
Change-Id: Icb355abf89ba1dee0281c32d6dd60c95fcdfdb61
Signed-off-by: Oleksii Mozghovyi <oleksii.mozghovyi@pantheon.tech>
(cherry picked from commit d73b2dd19bbc0989f1c9fdc44419657d176f26cd)

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
index 84e78b7b7d7dad59d6839cfa8a5201afdccdac7b..5006b36d5fd3879f3af11659d98c269bd907bae0 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
@@ -166,6 +166,7 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
     @Override
     public void close() {
         if (this.bgpPeerSingletonService != null) {
+            this.bgpPeerSingletonService.closeServiceInstance();
             this.bgpPeerSingletonService = null;
         }
         if (this.serviceRegistration != null) {
@@ -331,6 +332,10 @@ public class BgpPeer implements PeerBean, BGPPeerStateConsumer {
         }
 
         synchronized void instantiateServiceInstance() {
+            if (isServiceInstantiated) {
+                LOG.warn("Peer {} has already been instantiated", this.neighborAddress);
+                return;
+            }
             this.isServiceInstantiated = true;
             LOG.info("Peer instantiated {}", this.neighborAddress);
             this.bgpPeer.instantiateServiceInstance();