Stale MIP FIB/Flow entries present upon deletion of VRRP master

[netvirt.git] / vpnmanager / impl / src / main / java / org / opendaylight / netvirt / vpnmanager / DpnInVpnChangeListener.java

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java
index cec76fd9e9a5897f086cee0529b954cc8316b05f..2bad35cb12b16547c08fdebe08badef7f80bd98e 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java
@@ -7,20 +7,25 @@
  */
 package org.opendaylight.netvirt.vpnmanager;
 
+import static org.opendaylight.genius.infra.Datastore.OPERATIONAL;
+
 import com.google.common.base.Optional;
 import java.math.BigInteger;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.locks.ReentrantLock;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
+import org.opendaylight.genius.infra.Datastore.Operational;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
 import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.genius.infra.TypedWriteTransaction;
+import org.opendaylight.genius.utils.JvmGlobalLocks;
 import org.opendaylight.netvirt.vpnmanager.api.VpnHelper;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.AddDpnEvent;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.AddInterfaceToDpnOnVpnEvent;
@@ -57,45 +62,48 @@ public class DpnInVpnChangeListener implements OdlL3vpnListener {
         RemoveEventData eventData = notification.getRemoveEventData();
         final String rd = eventData.getRd();
         final String vpnName = eventData.getVpnName();
-        BigInteger dpnId = eventData.getDpnId();
+        BigInteger dpnId = eventData.getDpnId().toJava();
 
         LOG.trace("Remove Dpn Event notification received for rd {} VpnName {} DpnId {}", rd, vpnName, dpnId);
+        // FIXME: separate out to somehow?
+        final ReentrantLock lock = JvmGlobalLocks.getLockForString(vpnName);
+        lock.lock();
         try {
-            synchronized (vpnName.intern()) {
-                InstanceIdentifier<VpnInstanceOpDataEntry> id = VpnUtil.getVpnInstanceOpDataIdentifier(rd);
-                Optional<VpnInstanceOpDataEntry> vpnOpValue =
-                        SingleTransactionDataBroker.syncReadOptional(dataBroker, LogicalDatastoreType.OPERATIONAL, id);
-
-                if (vpnOpValue.isPresent()) {
-                    VpnInstanceOpDataEntry vpnInstOpData = vpnOpValue.get();
-                    List<VpnToDpnList> vpnToDpnList = vpnInstOpData.getVpnToDpnList();
-                    boolean flushDpnsOnVpn = true;
-                    for (VpnToDpnList dpn : vpnToDpnList) {
-                        if (dpn.getDpnState() == VpnToDpnList.DpnState.Active) {
-                            flushDpnsOnVpn = false;
-                            break;
-                        }
+            InstanceIdentifier<VpnInstanceOpDataEntry> id = VpnUtil.getVpnInstanceOpDataIdentifier(rd);
+            Optional<VpnInstanceOpDataEntry> vpnOpValue =
+                    SingleTransactionDataBroker.syncReadOptional(dataBroker, LogicalDatastoreType.OPERATIONAL, id);
+            if (vpnOpValue.isPresent()) {
+                VpnInstanceOpDataEntry vpnInstOpData = vpnOpValue.get();
+                List<VpnToDpnList> vpnToDpnList = vpnInstOpData.nonnullVpnToDpnList();
+                boolean flushDpnsOnVpn = true;
+                for (VpnToDpnList dpn : vpnToDpnList) {
+                    if (dpn.getDpnState() == VpnToDpnList.DpnState.Active) {
+                        flushDpnsOnVpn = false;
+                        break;
                     }
-                    if (flushDpnsOnVpn) {
-                        try {
-                            txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> deleteDpn(vpnToDpnList, rd, tx))
-                                    .get();
-                        } catch (InterruptedException | ExecutionException e) {
-                            LOG.error("Error removing dpnToVpnList for vpn {} ", vpnName);
-                            throw new RuntimeException(e.getMessage(), e);
-                        }
+                }
+                if (flushDpnsOnVpn) {
+                    try {
+                        txRunner.callWithNewWriteOnlyTransactionAndSubmit(OPERATIONAL,
+                            tx -> deleteDpn(vpnToDpnList, rd, tx)).get();
+                    } catch (InterruptedException | ExecutionException e) {
+                        LOG.error("Error removing dpnToVpnList for vpn {} ", vpnName);
+                        throw new RuntimeException(e.getMessage(), e);
                     }
                 }
             }
         } catch (ReadFailedException e) {
             LOG.error("onRemoveDpnEvent: Failed to read data store for rd {} vpn {} dpn {}", rd, vpnName, dpnId);
+        } finally {
+            lock.unlock();
         }
     }
 
-    protected void deleteDpn(Collection<VpnToDpnList> vpnToDpnList, String rd, WriteTransaction writeTxn) {
+    protected void deleteDpn(Collection<VpnToDpnList> vpnToDpnList, String rd, TypedWriteTransaction<Operational> tx) {
         for (final VpnToDpnList curDpn : vpnToDpnList) {
-            InstanceIdentifier<VpnToDpnList> vpnToDpnId = VpnHelper.getVpnToDpnListIdentifier(rd, curDpn.getDpnId());
-            writeTxn.delete(LogicalDatastoreType.OPERATIONAL, vpnToDpnId);
+            InstanceIdentifier<VpnToDpnList> vpnToDpnId = VpnHelper.getVpnToDpnListIdentifier(rd,
+                                                                        curDpn.getDpnId());
+            tx.delete(vpnToDpnId);
         }
     }