NETVIRT-1630 migrate to md-sal APIs

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

diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/AbstractIpLearnNotificationHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/AbstractIpLearnNotificationHandler.java
index 3b45c85d895bdde79b8be1456cd716dc6f86fa6b..f99916407a9e3483be82e36325c72a238a37ba68 100644 (file)
--- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/AbstractIpLearnNotificationHandler.java
+++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/iplearn/AbstractIpLearnNotificationHandler.java
@@ -8,16 +8,17 @@
 
 package org.opendaylight.netvirt.vpnmanager.iplearn;
 
-import com.google.common.base.Optional;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import java.math.BigInteger;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 import org.opendaylight.genius.mdsalutil.NWUtil;
+import org.opendaylight.genius.utils.JvmGlobalLocks;
 import org.opendaylight.netvirt.neutronvpn.api.enums.IpVersionChoice;
 import org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager;
 import org.opendaylight.netvirt.vpnmanager.VpnUtil;
@@ -26,11 +27,12 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.LearntVpnVipToPortEventAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.adjacency.list.Adjacency;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.l3vpn.rev200204.adjacency.list.Adjacency;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.neutron.vpn.portip.port.data.VpnPortipToPort;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.vpn.config.rev161130.VpnConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
+import org.opendaylight.yangtools.yang.common.Uint64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +41,7 @@ public abstract class AbstractIpLearnNotificationHandler {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractIpLearnNotificationHandler.class);
 
     // temp where Key is VPNInstance+IP and value is timestamp
-    private final Cache<Pair<String, String>, BigInteger> migrateIpCache;
+    private final Cache<Pair<String, String>, Uint64> migrateIpCache;
 
     protected final VpnConfig config;
     protected final VpnUtil vpnUtil;
@@ -52,7 +54,7 @@ public abstract class AbstractIpLearnNotificationHandler {
         this.vpnUtil = vpnUtil;
         this.neutronVpnManager = neutronVpnManager;
 
-        long duration = config.getIpLearnTimeout() * 10;
+        long duration = config.getIpLearnTimeout().toJava() * 10;
         long cacheSize = config.getMigrateIpCacheSize().longValue();
         migrateIpCache =
                 CacheBuilder.newBuilder().maximumSize(cacheSize).expireAfterWrite(duration,
@@ -61,9 +63,9 @@ public abstract class AbstractIpLearnNotificationHandler {
     }
 
     protected void validateAndProcessIpLearning(String srcInterface, IpAddress srcIP, MacAddress srcMac,
-            IpAddress targetIP, BigInteger metadata) {
+            IpAddress targetIP, Uint64 metadata) {
         List<Adjacency> adjacencies = vpnUtil.getAdjacenciesForVpnInterfaceFromConfig(srcInterface);
-        IpVersionChoice srcIpVersion = vpnUtil.getIpVersionFromString(srcIP.stringValue());
+        IpVersionChoice srcIpVersion = VpnUtil.getIpVersionFromString(srcIP.stringValue());
         boolean isSrcIpVersionPartOfVpn = false;
         if (adjacencies != null && !adjacencies.isEmpty()) {
             for (Adjacency adj : adjacencies) {
@@ -72,7 +74,7 @@ public abstract class AbstractIpLearnNotificationHandler {
                 if (NWUtil.isIpAddressInRange(srcIP, ipPrefix)) {
                     return;
                 }
-                IpVersionChoice currentAdjIpVersion = vpnUtil.getIpVersionFromString(adj.getIpAddress());
+                IpVersionChoice currentAdjIpVersion = VpnUtil.getIpVersionFromString(adj.getIpAddress());
                 if (srcIpVersion.isIpVersionChosen(currentAdjIpVersion)) {
                     isSrcIpVersionPartOfVpn = true;
                 }
@@ -88,14 +90,14 @@ public abstract class AbstractIpLearnNotificationHandler {
         processIpLearning(srcInterface, srcIP, srcMac, metadata, targetIP);
     }
 
-    protected void processIpLearning(String srcInterface, IpAddress srcIP, MacAddress srcMac, BigInteger metadata,
+    protected void processIpLearning(String srcInterface, IpAddress srcIP, MacAddress srcMac, Uint64 metadata,
                                      IpAddress dstIP) {
 
         if (!VpnUtil.isArpLearningEnabled()) {
             LOG.trace("Not handling packet as ARP Based Learning is disabled");
             return;
         }
-        if (metadata == null || Objects.equals(metadata, BigInteger.ZERO)) {
+        if (metadata == null || Objects.equals(metadata, Uint64.ZERO)) {
             return;
         }
 
@@ -111,7 +113,9 @@ public abstract class AbstractIpLearnNotificationHandler {
         for (String vpnName : vpnList.get()) {
             LOG.info("Received ARP/NA for sender MAC {} and sender IP {} via interface {}", srcMac.getValue(),
                     srcIpToQuery, srcInterface);
-            synchronized ((vpnName + srcIpToQuery).intern()) {
+            final ReentrantLock lock = lockFor(vpnName, srcIpToQuery);
+            lock.lock();
+            try {
                 VpnPortipToPort vpnPortipToPort = vpnUtil.getNeutronPortFromVpnPortFixedIp(vpnName, srcIpToQuery);
                 // Check if this IP belongs to  external network
                 if (vpnPortipToPort == null) {
@@ -144,7 +148,8 @@ public abstract class AbstractIpLearnNotificationHandler {
                 // within 300sec
                 // after reboot, it would be ignored.
                 if (vpnPortipToPort != null && vpnPortipToPort.isLearntIp()) {
-                    if (System.currentTimeMillis() < this.bootupTime + config.getBootDelayArpLearning() * 1000) {
+                    if (System.currentTimeMillis()
+                            < this.bootupTime + config.getBootDelayArpLearning().toJava() * 1000) {
                         LOG.trace("GARP/Arp Response not handled for IP {} vpnName {} for time {}s",
                                 vpnPortipToPort.getPortFixedip(), vpnName, config.getBootDelayArpLearning());
                         continue;
@@ -174,6 +179,8 @@ public abstract class AbstractIpLearnNotificationHandler {
                     }
                     learnMacFromIncomingPacket(vpnName, srcInterface, srcIP, srcMac, dstIP);
                 }
+            } finally {
+                lock.unlock();
             }
         }
     }
@@ -182,9 +189,13 @@ public abstract class AbstractIpLearnNotificationHandler {
             IpAddress dstIP) {
         String srcIpToQuery = srcIP.stringValue();
         String destIpToQuery = dstIP.stringValue();
-        synchronized ((vpnName + srcIpToQuery).intern()) {
+        final ReentrantLock lock = lockFor(vpnName, srcIpToQuery);
+        lock.lock();
+        try {
             vpnUtil.createLearntVpnVipToPortEvent(vpnName, srcIpToQuery, destIpToQuery, srcInterface,
                     srcMac.getValue(), LearntVpnVipToPortEventAction.Add, null);
+        } finally {
+            lock.unlock();
         }
     }
 
@@ -196,7 +207,7 @@ public abstract class AbstractIpLearnNotificationHandler {
         }
         LOG.debug("IP_MIGRATE_CACHE: add to dirty cache IP {} vpnName {} with MAC {}", ipToQuery, vpnName, srcMac);
         migrateIpCache.put(new ImmutablePair<>(vpnName, ipToQuery),
-                new BigInteger(String.valueOf(System.currentTimeMillis())));
+                Uint64.valueOf(String.valueOf(System.currentTimeMillis())));
     }
 
     private boolean isIpInMigrateCache(String vpnName, String ipToQuery) {
@@ -204,13 +215,13 @@ public abstract class AbstractIpLearnNotificationHandler {
             return false;
         }
         Pair<String, String> keyPair = new ImmutablePair<>(vpnName, ipToQuery);
-        BigInteger prevTimeStampCached = migrateIpCache.getIfPresent(keyPair);
+        Uint64 prevTimeStampCached = migrateIpCache.getIfPresent(keyPair);
         if (prevTimeStampCached == null) {
             LOG.debug("IP_MIGRATE_CACHE: there is no IP {} vpnName {} in dirty cache, so learn it",
                     ipToQuery, vpnName);
             return false;
         }
-        if (System.currentTimeMillis() > prevTimeStampCached.longValue() + config.getIpLearnTimeout()) {
+        if (System.currentTimeMillis() > prevTimeStampCached.longValue() + config.getIpLearnTimeout().toJava()) {
             LOG.debug("IP_MIGRATE_CACHE: older than timeout value - remove from dirty cache IP {} vpnName {}",
                     ipToQuery, vpnName);
             migrateIpCache.invalidate(keyPair);
@@ -220,4 +231,9 @@ public abstract class AbstractIpLearnNotificationHandler {
                 ipToQuery, vpnName);
         return true;
     }
+
+    private static ReentrantLock lockFor(String vpnName, String srcIpToQuery) {
+        // FIXME: form an Identifier? That would side-step string concat here
+        return JvmGlobalLocks.getLockForString(vpnName + srcIpToQuery);
+    }
 }