Synchronize close methods in RIB and topology provider to avoid closing conflicts.

Change-Id: I758e55c932500189aead22dd858af140a93d3667
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
(cherry picked from commit e8720b80736a53313a01c0381601d3a5ea43a170)

diff --git a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
index ed3f36b1eff39b36799c72c8c0c29042005e7141..674cec775312813dd630fabe78df91b40f84da64 100644 (file)
--- a/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
+++ b/bgp/topology-provider/src/main/java/org/opendaylight/bgpcep/bgp/topology/provider/AbstractTopologyBuilder.java
@@ -11,13 +11,12 @@ import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
-
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
-
+import javax.annotation.concurrent.GuardedBy;
 import org.opendaylight.bgpcep.topology.TopologyReference;
 import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@@ -57,6 +56,9 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements AutoCl
     private final RibReference locRibReference;
     private final Class<T> idClass;
 
+    @GuardedBy("this")
+    private boolean closed = false;
+
     protected AbstractTopologyBuilder(final DataBroker dataProvider, final RibReference locRibReference,
             final TopologyId topologyId, final TopologyTypes types, final Class<T> idClass) {
         this.locRibReference = Preconditions.checkNotNull(locRibReference);
@@ -73,7 +75,7 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements AutoCl
         try {
             o = t.read(LogicalDatastoreType.OPERATIONAL, this.topology).get();
         } catch (InterruptedException | ExecutionException e) {
-            throw new IllegalStateException("Failed to read topology " + topology, e);
+            throw new IllegalStateException("Failed to read topology " + this.topology, e);
         }
         Preconditions.checkState(!o.isPresent(), "Data provider conflict detected on object {}", this.topology);
 
@@ -118,9 +120,13 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements AutoCl
     }
 
     @Override
-    public final void onLocRIBChange(final ReadWriteTransaction trans,
+    public synchronized final void onLocRIBChange(final ReadWriteTransaction trans,
             final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> event) {
         LOG.debug("Received data change {} event with transaction {}", event, trans.getIdentifier());
+        if (this.closed) {
+            LOG.trace("Transaction chain was already closed, skipping update.");
+            return;
+        }
 
         // FIXME: speed this up
         final Set<InstanceIdentifier<T>> ids = new HashSet<>();
@@ -167,12 +173,13 @@ public abstract class AbstractTopologyBuilder<T extends Route> implements AutoCl
     }
 
     @Override
-    public final void close() throws TransactionCommitFailedException {
+    public synchronized final void close() throws TransactionCommitFailedException {
         LOG.info("Shutting down builder for {}", getInstanceIdentifier());
         final WriteTransaction trans = this.chain.newWriteOnlyTransaction();
         trans.delete(LogicalDatastoreType.OPERATIONAL, getInstanceIdentifier());
         trans.submit().checkedGet();
         this.chain.close();
+        this.closed = true;
     }
 
     @Override