X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Farphandler%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Farphandler%2Finternal%2FArpHandler.java;h=627ab267399978950d66f7dd1625f25a2c405021;hb=e7df3a0260ee5c2d805d1638af5e51f08022b891;hp=0ff1cd9bd6a542dc8694b09933bfe2c1835d3bbd;hpb=c5630f2945eb5370f9829514ef72de41d41eb2be;p=controller.git diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java index 0ff1cd9bd6..627ab26739 100644 --- a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java +++ b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java @@ -21,10 +21,13 @@ import java.util.HashSet; import java.util.Set; import java.util.Timer; import java.util.TimerTask; +import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; +import java.util.concurrent.LinkedBlockingQueue; +import org.opendaylight.controller.arphandler.ARPCacheEvent; import org.opendaylight.controller.arphandler.ARPEvent; import org.opendaylight.controller.arphandler.ARPReply; import org.opendaylight.controller.arphandler.ARPRequest; @@ -49,6 +52,7 @@ import org.opendaylight.controller.sal.packet.IPv4; import org.opendaylight.controller.sal.packet.Packet; import org.opendaylight.controller.sal.packet.PacketResult; import org.opendaylight.controller.sal.packet.RawPacket; +import org.opendaylight.controller.sal.topology.TopoEdgeUpdate; import org.opendaylight.controller.sal.utils.EtherTypes; import org.opendaylight.controller.sal.utils.HexEncode; import org.opendaylight.controller.sal.utils.NetUtils; @@ -71,6 +75,9 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA private ConcurrentMap> arpRequestors; private ConcurrentMap countDownTimers; private Timer periodicTimer; + private BlockingQueue ARPCacheEvents = new LinkedBlockingQueue(); + private Thread cacheEventHandler; + private boolean stopping = false; /* * A cluster allocated cache. Used for synchronizing ARP request/reply * events across all cluster controllers. To raise an event, we put() a specific @@ -218,7 +225,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA try { requestor = new HostNodeConnector(sourceMAC, sourceIP, p, subnet.getVlan()); } catch (ConstructionException e) { - log.debug("Received ARP packet with invalid MAC: {}", sourceMAC); + log.debug("Received ARP packet with invalid MAC: {}", HexEncode.bytesToHexString(sourceMAC)); return; } /* @@ -262,7 +269,8 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA && (NetUtils.isBroadcastMACAddr(targetMAC) || Arrays.equals(targetMAC, getControllerMAC()))) { if (connectionManager.isLocal(p.getNode())){ if (log.isTraceEnabled()){ - log.trace("Received local ARP req. for default gateway. Replying with controller MAC: {}", getControllerMAC()); + log.trace("Received local ARP req. for default gateway. Replying with controller MAC: {}", + HexEncode.bytesToHexString(getControllerMAC())); } sendARPReply(p, getControllerMAC(), targetIP, pkt.getSenderHardwareAddress(), sourceIP); } else { @@ -291,7 +299,6 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA //Raise a bcast request event, all controllers need to send one log.trace("Sending a bcast ARP request for {}", targetIP); arpRequestReplyEvent.put(new ARPRequest(targetIP, subnet), false); - } else { /* * Target host known (across the cluster), send ARP REPLY make sure that targetMAC @@ -331,6 +338,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA * the targetIP as the target Network Address */ protected void sendBcastARPRequest(InetAddress targetIP, Subnet subnet) { + log.trace("sendBcatARPRequest targetIP:{} subnet:{}", targetIP, subnet); Set nodeConnectors; if (subnet.isFlatLayer2()) { nodeConnectors = new HashSet(); @@ -342,11 +350,11 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } for (NodeConnector p : nodeConnectors) { - //fiter out any non-local or internal ports if (! connectionManager.isLocal(p.getNode()) || topologyManager.isInternal(p)) { continue; } + log.trace("Sending toward nodeConnector:{}", p); ARP arp = new ARP(); byte[] senderIP = subnet.getNetworkAddress().getAddress(); byte[] targetIPByte = targetIP.getAddress(); @@ -387,7 +395,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA * The sender MAC is the controller's MAC */ protected void sendUcastARPRequest(HostNodeConnector host, Subnet subnet) { - + log.trace("sendUcastARPRequest host:{} subnet:{}", host, subnet); NodeConnector outPort = host.getnodeConnector(); if (outPort == null) { log.error("Failed sending UcastARP because cannot extract output port from Host: {}", host); @@ -420,6 +428,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA this.dataPacketService.transmitDataPacket(destPkt); } + @Override public void find(InetAddress networkAddress) { log.trace("Received find IP {}", networkAddress); @@ -439,6 +448,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA /* * Probe the host by sending a unicast ARP Request to the host */ + @Override public void probe(HostNodeConnector host) { log.trace("Received probe host {}", host); @@ -504,6 +514,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA void init() { arpRequestors = new ConcurrentHashMap>(); countDownTimers = new ConcurrentHashMap(); + cacheEventHandler = new Thread(new ARPCacheEventHandler(), "ARPCacheEventHandler Thread"); allocateCaches(); retrieveCaches(); @@ -536,7 +547,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA try{ clusterContainerService.createCache(ARP_EVENT_CACHE_NAME, - EnumSet.of(IClusterServices.cacheMode.NON_TRANSACTIONAL)); + EnumSet.of(IClusterServices.cacheMode.TRANSACTIONAL)); } catch (CacheConfigException e){ log.error("ARPHandler cache configuration invalid!"); } catch (CacheExistException e){ @@ -555,6 +566,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA * */ void destroy() { + cacheEventHandler.interrupt(); } /** @@ -564,7 +576,9 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA * */ void start() { + stopping = false; startPeriodicTimer(); + cacheEventHandler.start(); } /** @@ -577,6 +591,7 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } void stopping() { + stopping = true; cancelPeriodicTimer(); } @@ -657,15 +672,25 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA } private void generateAndSendReply(InetAddress sourceIP, byte[] sourceMAC) { + if (log.isTraceEnabled()) { + log.trace("generateAndSendReply called with params sourceIP:{} sourceMAC:{}", sourceIP, + HexEncode.bytesToHexString(sourceMAC)); + } Set hosts = arpRequestors.remove(sourceIP); if ((hosts == null) || hosts.isEmpty()) { + log.trace("Bailing out no requestors Hosts"); return; } countDownTimers.remove(sourceIP); for (HostNodeConnector host : hosts) { - log.trace("Sending ARP Reply with src {}/{}, target {}/{}", - new Object[] { sourceMAC, sourceIP, host.getDataLayerAddressBytes(), host.getNetworkAddress() }); - + if (log.isTraceEnabled()) { + log.trace("Sending ARP Reply with src {}/{}, target {}/{}", + new Object[] { + HexEncode.bytesToHexString(sourceMAC), + sourceIP, + HexEncode.bytesToHexString(host.getDataLayerAddressBytes()), + host.getNetworkAddress() }); + } if (connectionManager.isLocal(host.getnodeconnectorNode())){ sendARPReply(host.getnodeConnector(), sourceMAC, @@ -673,6 +698,12 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA host.getDataLayerAddressBytes(), host.getNetworkAddress()); } else { + /* + * In the remote event a requestor moved to another + * controller it may turn out it now we need to send + * the ARP reply from a different controller, this + * cover the case + */ arpRequestReplyEvent.put( new ARPReply( host.getnodeConnector(), @@ -687,31 +718,8 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA @Override public void entryUpdated(ARPEvent key, Boolean new_value, String cacheName, boolean originLocal) { - if (key instanceof ARPRequest) { - ARPRequest req = (ARPRequest) key; - // If broadcast request - if (req.getHost() == null) { - sendBcastARPRequest(req.getTargetIP(), req.getSubnet()); - - //If unicast and local, send reply - } else if (connectionManager.isLocal(req.getHost().getnodeconnectorNode())) { - sendUcastARPRequest(req.getHost(), req.getSubnet()); - } - } else if (key instanceof ARPReply) { - ARPReply rep = (ARPReply) key; - // New reply received by controller, notify all awaiting requestors across the cluster - if (new_value) { - generateAndSendReply(rep.getTargetIP(), rep.getTargetMac()); - - // Otherwise, a specific reply. If local, send out. - } else if (connectionManager.isLocal(rep.getPort().getNode())) { - sendARPReply(rep.getPort(), - rep.getSourceMac(), - rep.getSourceIP(), - rep.getTargetMac(), - rep.getTargetIP()); - } - } + log.trace("Got and entryUpdated for cacheName {} key {} isNew {}", cacheName, key, new_value); + enqueueARPCacheEvent(key, new_value); } @Override @@ -722,4 +730,62 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA public void entryDeleted(ARPEvent key, String cacheName, boolean originLocal) { // nothing to do } + + private void enqueueARPCacheEvent (ARPEvent event, boolean new_value) { + try { + ARPCacheEvent cacheEvent = new ARPCacheEvent(event, new_value); + if (!ARPCacheEvents.contains(cacheEvent)) { + this.ARPCacheEvents.add(cacheEvent); + log.trace("Enqueued {}", event); + } + } catch (Exception e) { + log.debug("enqueueARPCacheEvent caught Interrupt Exception for event {}", event); + } + } + + /* + * this thread monitors the connectionEvent queue for new incoming events from + */ + private class ARPCacheEventHandler implements Runnable { + @Override + public void run() { + while (!stopping) { + try { + ARPCacheEvent ev = ARPCacheEvents.take(); + ARPEvent event = ev.getEvent(); + if (event instanceof ARPRequest) { + ARPRequest req = (ARPRequest) event; + // If broadcast request + if (req.getHost() == null) { + log.trace("Trigger and ARP Broadcast Request upon receipt of {}", req); + sendBcastARPRequest(req.getTargetIP(), req.getSubnet()); + + //If unicast and local, send reply + } else if (connectionManager.isLocal(req.getHost().getnodeconnectorNode())) { + log.trace("ARPCacheEventHandler - sendUcatARPRequest upon receipt of {}", req); + sendUcastARPRequest(req.getHost(), req.getSubnet()); + } + } else if (event instanceof ARPReply) { + ARPReply rep = (ARPReply) event; + // New reply received by controller, notify all awaiting requestors across the cluster + if (ev.isNewReply()) { + log.trace("Trigger a generateAndSendReply in response to {}", rep); + generateAndSendReply(rep.getTargetIP(), rep.getTargetMac()); + // Otherwise, a specific reply. If local, send out. + } else if (connectionManager.isLocal(rep.getPort().getNode())) { + log.trace("ARPCacheEventHandler - sendUcatARPReply locally in response to {}", rep); + sendARPReply(rep.getPort(), + rep.getSourceMac(), + rep.getSourceIP(), + rep.getTargetMac(), + rep.getTargetIP()); + } + } + } catch (InterruptedException e) { + ARPCacheEvents.clear(); + return; + } + } + } + } }