Modify HostTracker to be able to interact with multiple host finders

[controller.git] / opendaylight / hosttracker / implementation / src / main / java / org / opendaylight / controller / hosttracker / internal / HostTracker.java

diff --git a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java b/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java
index 9f0cd893b09902a2781fb82480cee345413847b4..df62c1985a62b5e7b11db450a39586d3ce0a8d58 100644 (file)
--- a/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java
+++ b/opendaylight/hosttracker/implementation/src/main/java/org/opendaylight/controller/hosttracker/internal/HostTracker.java
@@ -24,6 +24,7 @@ import java.util.TimerTask;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -88,7 +89,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
     static final String ACTIVE_HOST_CACHE = "hosttracker.ActiveHosts";
     static final String INACTIVE_HOST_CACHE = "hosttracker.InactiveHosts";
     private static final Logger logger = LoggerFactory.getLogger(HostTracker.class);
-    protected IHostFinder hostFinder;
+    protected final Set<IHostFinder> hostFinder = new CopyOnWriteArraySet<IHostFinder>();;
     protected ConcurrentMap<InetAddress, HostNodeConnector> hostsDB;
     /*
      * Following is a list of hosts which have been requested by NB APIs to be
@@ -106,6 +107,8 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
     private String containerName = null;
     private ExecutorService executor;
     protected boolean stopping;
+    private static boolean hostRefresh = true;
+    private static int hostRetryCount = 5;
     private static class ARPPending {
         protected InetAddress hostIP;
         protected short sent_count;
@@ -235,13 +238,15 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
     }
 
     public void setArpHandler(IHostFinder hostFinder) {
-        this.hostFinder = hostFinder;
+        if (this.hostFinder != null) {
+            this.hostFinder.add(hostFinder);
+        }
     }
 
     public void unsetArpHandler(IHostFinder hostFinder) {
-        if (this.hostFinder == hostFinder) {
+        if (this.hostFinder != null) {
             logger.debug("Arp Handler Service removed!");
-            this.hostFinder = null;
+            this.hostFinder.remove(hostFinder);
         }
     }
 
@@ -341,8 +346,9 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
                 networkAddress.getHostAddress());
 
         /* host is not found, initiate a discovery */
-
-        hostFinder.find(networkAddress);
+        for (IHostFinder hf : hostFinder) {
+            hf.find(networkAddress);
+        }
         return null;
     }
 
@@ -510,8 +516,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
 
     @Override
     public void hostListener(HostNodeConnector host) {
-
-        logger.debug("ARP received for Host: IP {}, MAC {}, {}", host.getNetworkAddress().getHostAddress(),
+        logger.debug("Received for Host: IP {}, MAC {}, {}", host.getNetworkAddress().getHostAddress(),
                 HexEncode.bytesToHexString(host.getDataLayerAddressBytes()), host);
         if (hostExists(host)) {
             HostNodeConnector existinghost = hostsDB.get(host.getNetworkAddress());
@@ -694,9 +699,9 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
         int num = 1;
         for (ArrayList<String> hierarchy : hierarchies) {
             StringBuffer buf = new StringBuffer();
-            buf.append("Hierarchy#" + num + " : ");
+            buf.append("Hierarchy#").append(num).append(" : ");
             for (String switchName : hierarchy) {
-                buf.append(switchName + "/");
+                buf.append(switchName).append("/");
             }
             logger.debug("{} -> {}", getContainerName(), buf);
             num++;
@@ -771,7 +776,6 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
      */
     @SuppressWarnings("unchecked")
     private void updateCurrentHierarchy(Node node, ArrayList<String> currHierarchy, List<List<String>> fullHierarchy) {
-        // currHierarchy.add(String.format("%x", currSw.getId()));
         currHierarchy.add(dpidToHostNameHack((Long) node.getID()));
         // Shallow copy as required
         ArrayList<String> currHierarchyClone = (ArrayList<String>) currHierarchy.clone();
@@ -907,7 +911,9 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
                     continue;
                 }
                 logger.debug("Sending the ARP from FailedARPReqList fors IP: {}", arphost.getHostIP().getHostAddress());
-                hostFinder.find(arphost.getHostIP());
+                for (IHostFinder hf : hostFinder) {
+                    hf.find(arphost.getHostIP());
+                }
             }
         }
     }
@@ -933,7 +939,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
                     ARPPendingList.remove(entry.getKey());
                     continue;
                 }
-                if (arphost.getSent_count() < switchManager.getHostRetryCount()) {
+                if (arphost.getSent_count() < hostRetryCount) {
                     /*
                      * No reply has been received of first ARP Req, send the
                      * next one. Before sending the ARP, check if ARPHandler is
@@ -943,10 +949,12 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
                         logger.warn("ARPHandler Services are not available for Outstanding ARPs");
                         continue;
                     }
-                    hostFinder.find(arphost.getHostIP());
+                    for (IHostFinder hf : hostFinder) {
+                        hf.find(arphost.getHostIP());
+                    }
                     arphost.sent_count++;
                     logger.debug("ARP Sent from ARPPending List, IP: {}", arphost.getHostIP().getHostAddress());
-                } else if (arphost.getSent_count() >= switchManager.getHostRetryCount()) {
+                } else if (arphost.getSent_count() >= hostRetryCount) {
                     /*
                      * ARP requests have been sent without receiving a reply,
                      * remove this from the pending list
@@ -977,9 +985,9 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
             if ((clusterContainerService != null) && !clusterContainerService.amICoordinator()) {
                 return;
             }
-            if ((switchManager != null) && !switchManager.isHostRefreshEnabled()) {
+            if (!hostRefresh) {
                 /*
-                 * The host probe procedure was disabled by CLI
+                 * The host probe procedure is turned off
                  */
                 return;
             }
@@ -997,7 +1005,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
 
                 short arp_cntdown = host.getArpSendCountDown();
                 arp_cntdown--;
-                if (arp_cntdown > switchManager.getHostRetryCount()) {
+                if (arp_cntdown > hostRetryCount) {
                     host.setArpSendCountDown(arp_cntdown);
                 } else if (arp_cntdown <= 0) {
                     /*
@@ -1006,7 +1014,7 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
                      */
                     removeKnownHost(entry.getKey());
                     notifyHostLearnedOrRemoved(host, false);
-                } else if (arp_cntdown <= switchManager.getHostRetryCount()) {
+                } else if (arp_cntdown <= hostRetryCount) {
                     /*
                      * Use the services of arphandler to check if host is still
                      * there
@@ -1027,7 +1035,9 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
                         logger.trace("ARPHandler is not avaialable, can't send the probe");
                         continue;
                     }
-                    hostFinder.probe(host);
+                    for (IHostFinder hf : hostFinder) {
+                        hf.probe(host);
+                    }
                 }
             }
         }
@@ -1332,7 +1342,9 @@ public class HostTracker implements IfIptoHost, IfHostListener, ISwitchManagerAw
             try {
                 byte[] dataLayerAddress = NetUtils.getBroadcastMACAddr();
                 host = new HostNodeConnector(dataLayerAddress, arphost.getHostIP(), nodeConnector, (short) 0);
-                hostFinder.probe(host);
+                for (IHostFinder hf : hostFinder) {
+                    hf.probe(host);
+                }
             } catch (ConstructionException e) {
                 logger.debug("HostNodeConnector couldn't be created for Host: {}, NodeConnector: {}",
                         arphost.getHostIP(), nodeConnector);