X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fprotocol_plugins%2Fopenflow%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fprotocol_plugin%2Fopenflow%2Finternal%2FDiscoveryService.java;h=548bfb1f9fb26eb93ab4ca5bcd456d9bdc4082c3;hp=527382fafb564daf9824ecea86711d7c89155c4d;hb=d9de6c2ddfb30eb2eee782c229f6e03cef352bbd;hpb=a9e6627736e99183c5c6be4dd42ec364836acb80 diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java index 527382fafb..548bfb1f9f 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DiscoveryService.java @@ -11,6 +11,7 @@ package org.opendaylight.controller.protocol_plugin.openflow.internal; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -32,16 +33,11 @@ import org.opendaylight.controller.protocol_plugin.openflow.IInventoryProvider; import org.opendaylight.controller.protocol_plugin.openflow.IInventoryShimExternalListener; import org.opendaylight.controller.protocol_plugin.openflow.core.IController; import org.opendaylight.controller.protocol_plugin.openflow.core.ISwitch; -import org.openflow.protocol.OFPhysicalPort; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import org.opendaylight.controller.sal.connection.IPluginOutConnectionService; import org.opendaylight.controller.sal.core.Config; import org.opendaylight.controller.sal.core.ConstructionException; -import org.opendaylight.controller.sal.core.Edge; import org.opendaylight.controller.sal.core.ContainerFlow; +import org.opendaylight.controller.sal.core.Edge; import org.opendaylight.controller.sal.core.IContainerListener; import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.NodeConnector; @@ -59,6 +55,11 @@ import org.opendaylight.controller.sal.utils.HexEncode; import org.opendaylight.controller.sal.utils.NetUtils; import org.opendaylight.controller.sal.utils.NodeConnectorCreator; import org.opendaylight.controller.sal.utils.NodeCreator; +import org.openflow.protocol.OFPhysicalPort; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The class describes neighbor discovery service for an OpenFlow network. @@ -70,42 +71,44 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa private IDiscoveryListener discoveryListener = null; private IInventoryProvider inventoryProvider = null; private IDataPacketMux iDataPacketMux = null; - // Newly added ports go into this list and will be served first + // High priority list containing newly added ports which will be served first private List readyListHi = null; - // Come here after served at least once + // List containing all the ports which will be served periodically private List readyListLo = null; // Staging area during quiet period - private List waitingList = null; + private List stagingList = null; // Wait for next discovery packet. The map contains the time elapsed since // the last received LLDP frame on each node connector - private ConcurrentMap pendingMap = null; - // openflow edges keyed by head connector + private ConcurrentMap holdTime = null; + // Allow one more retry for newly added ports. This map contains the time + // period elapsed since last discovery pkt transmission on the port. + private ConcurrentMap elapsedTime = null; + // OpenFlow edges keyed by head connector private ConcurrentMap edgeMap = null; - // Aging entries keyed by head edge connector + // The map contains aging entry keyed by head connector of Production edge private ConcurrentMap agingMap = null; - // Production edges keyed by head edge connector + // Production edges keyed by head connector private ConcurrentMap prodMap = null; private Timer discoveryTimer; private DiscoveryTimerTask discoveryTimerTask; - private long discoveryTimerTick = 1L * 1000; // per tick in msec + private final static long discoveryTimerTick = 2L * 1000; // per tick in msec private int discoveryTimerTickCount = 0; // main tick counter // Max # of ports handled in one batch - private int discoveryBatchMaxPorts = 500; + private int discoveryBatchMaxPorts; // Periodically restart batching process - private int discoveryBatchRestartTicks = getDiscoveryInterval(); - private int discoveryBatchPausePeriod = 5; // pause for few secs + private int discoveryBatchRestartTicks; + private int discoveryBatchPausePeriod = 2; // Pause after this point - private int discoveryBatchPauseTicks = discoveryBatchRestartTicks - discoveryBatchPausePeriod; - // Number of retries after initial timeout - private int discoveryRetry = getDiscoveryRetry(); - private int discoveryTimeoutTicks = getDiscoveryTimeout(); // timeout in sec - private int discoveryAgeoutTicks = 120; // age out 2 min + private int discoveryBatchPauseTicks; + private int discoveryTimeoutTicks; + private int discoveryThresholdTicks; + private int discoveryAgeoutTicks; // multiple of discoveryBatchRestartTicks private int discoveryConsistencyCheckMultiple = 2; // CC tick counter - private int discoveryConsistencyCheckTickCount = discoveryBatchPauseTicks; - // # of times CC getscalled + private int discoveryConsistencyCheckTickCount; + // # of times CC gets called private int discoveryConsistencyCheckCallingTimes = 0; // # of cases CC corrected private int discoveryConsistencyCheckCorrected = 0; @@ -122,10 +125,12 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa private Boolean throttling = false; // if true, no more batching. private volatile Boolean shuttingDown = false; - private LLDPTLV chassisIdTlv, portIdTlv, ttlTlv, customTlv; + private LLDPTLV chassisIdTlv, systemNameTlv, portIdTlv, ttlTlv, customTlv; + private IPluginOutConnectionService connectionOutService; class DiscoveryTransmit implements Runnable { private final BlockingQueue transmitQ; + private int count = 0; DiscoveryTransmit(BlockingQueue transmitQ) { this.transmitQ = transmitQ; @@ -139,6 +144,9 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa RawPacket outPkt = createDiscoveryPacket(nodeConnector); sendDiscoveryPacket(nodeConnector, outPkt); nodeConnector = null; + if ((++count & 0x7f) == 0) { + Thread.sleep(10); + } } catch (InterruptedException e1) { logger.warn("DiscoveryTransmit interupted", e1.getMessage()); if (shuttingDown) { @@ -161,6 +169,46 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa } } + public enum DiscoveryPeriod { + INTERVAL (300), + AGEOUT (120), + THRESHOLD (30); + + private int time; // sec + private int tick; // tick + + DiscoveryPeriod(int time) { + this.time = time; + this.tick = time2Tick(time); + } + + public int getTime() { + return time; + } + + public void setTime(int time) { + this.time = time; + this.tick = time2Tick(time); + } + + public int getTick() { + return tick; + } + + public void setTick(int tick) { + this.time = tick2Time(tick); + this.tick = tick; + } + + private int time2Tick(int time) { + return (int) (time / (discoveryTimerTick / 1000)); + } + + private int tick2Time(int tick) { + return (int) (tick * (discoveryTimerTick / 1000)); + } + } + private RawPacket createDiscoveryPacket(NodeConnector nodeConnector) { String nodeId = HexEncode.longToHexString((Long) nodeConnector.getNode().getID()); @@ -169,6 +217,11 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa chassisIdTlv.setType(LLDPTLV.TLVType.ChassisID.getValue()).setLength((short) cidValue.length) .setValue(cidValue); + // Create LLDP SystemName TLV + byte[] snValue = LLDPTLV.createSystemNameTLVValue(nodeConnector.getNode().toString()); + systemNameTlv.setType(LLDPTLV.TLVType.SystemName.getValue()).setLength((short) snValue.length) + .setValue(snValue); + // Create LLDP PortID TLV String portId = nodeConnector.getNodeConnectorIDString(); byte[] pidValue = LLDPTLV.createPortIDTLVValue(portId); @@ -185,7 +238,8 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa // Create discovery pkt LLDP discoveryPkt = new LLDP(); - discoveryPkt.setChassisId(chassisIdTlv).setPortId(portIdTlv).setTtl(ttlTlv).setOptionalTLVList(customList); + discoveryPkt.setChassisId(chassisIdTlv).setPortId(portIdTlv).setTtl(ttlTlv).setSystemNameId(systemNameTlv) + .setOptionalTLVList(customList); RawPacket rawPkt = null; try { @@ -213,6 +267,11 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa return; } + if (!connectionOutService.isLocal(nodeConnector.getNode())) { + logger.debug("Discoery packets will not be sent to {} in a non-master controller", nodeConnector.toString()); + return; + } + if (outPkt == null) { logger.debug("Can not send discovery packet out since outPkt is null"); return; @@ -258,12 +317,18 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa return PacketResult.IGNORED; } - if (((Short) inPkt.getIncomingNodeConnector().getID()).equals(NodeConnector.SPECIALNODECONNECTORID)) { + NodeConnector nodeConnector = inPkt.getIncomingNodeConnector(); + if (((Short) nodeConnector.getID()).equals(NodeConnector.SPECIALNODECONNECTORID)) { logger.trace("Ignoring ethernet packet received on special port: " + inPkt.getIncomingNodeConnector().toString()); return PacketResult.IGNORED; } + if (!connectionOutService.isLocal(nodeConnector.getNode())) { + logger.debug("Discoery packets will not be processed from {} in a non-master controller", nodeConnector.toString()); + return PacketResult.IGNORED; + } + Ethernet ethPkt = new Ethernet(); try { ethPkt.deserialize(data, 0, data.length * NetUtils.NumBitsInAByte); @@ -326,7 +391,12 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa updateProdEdge(edge, props); } catch (Exception e) { - logger.warn("Caught exception ", e); + if (logger.isDebugEnabled()) { + logger.debug( + "Caught exception while attempting to snoop non controller generated or malformed LLDP frame sent by {} and received on {}: {}", + HexEncode.bytesToHexStringFormat(ethPkt.getSourceMACAddress()), dstNodeConnector, + e.getMessage()); + } } } @@ -347,7 +417,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa List optionalTLVList = lldp.getOptionalTLVList(); if (optionalTLVList == null) { - logger.info("The discovery packet with null custom option from {}", dstNodeConnector); + logger.warn("The discovery packet with null custom option from {}", dstNodeConnector); return false; } @@ -378,7 +448,6 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa logger.error("Caught exception ", e); } addEdge(edge, props); - pendingMap.put(dstNodeConnector, 0); logger.trace("Received discovery packet for Edge {}", edge); @@ -441,11 +510,11 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa return true; } - if (pendingMap.keySet().contains(nodeConnector)) { + if (holdTime.keySet().contains(nodeConnector)) { return true; } - if (waitingList.contains(nodeConnector)) { + if (stagingList.contains(nodeConnector)) { return true; } @@ -463,6 +532,9 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa workingSet.add(nodeConnector); removeSet.add(nodeConnector); + + // Put it in the map and start the timer. It may need retry. + elapsedTime.put(nodeConnector, 0); } readyListHi.removeAll(removeSet); @@ -499,10 +571,11 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa private void addDiscovery(Node node) { Map switches = controller.getSwitches(); ISwitch sw = switches.get(node.getID()); - List ports = sw.getEnabledPorts(); - if (ports == null) { + if (sw == null) { + //switch could be removed by now, stop propagation return; } + List ports = sw.getEnabledPorts(); for (OFPhysicalPort port : ports) { NodeConnector nodeConnector = NodeConnectorCreator.createOFNodeConnector(port.getPortNumber(), node); if (!readyListHi.contains(nodeConnector)) { @@ -519,6 +592,14 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa readyListHi.add(nodeConnector); } + private void removeNodeConnector(NodeConnector nodeConnector) { + readyListLo.remove(nodeConnector); + readyListHi.remove(nodeConnector); + stagingList.remove(nodeConnector); + holdTime.remove(nodeConnector); + elapsedTime.remove(nodeConnector); + } + private Set getRemoveSet(Collection c, Node node) { Set removeSet = new HashSet(); if (c == null) { @@ -535,56 +616,68 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa private void removeDiscovery(Node node) { Set removeSet; + removeSet = getRemoveSet(edgeMap.keySet(), node); + NodeConnector peerConnector; + Edge edge1, edge2; + for (NodeConnector nodeConnector : removeSet) { + // get the peer for fast removal of the edge in reverse direction + peerConnector = null; + edge1 = edgeMap.get(nodeConnector); + if (edge1 != null) { + edge2 = edgeMap.get(edge1.getTailNodeConnector()); + if ((edge2 != null) && node.equals(edge2.getTailNodeConnector().getNode())) { + peerConnector = edge2.getHeadNodeConnector(); + } + } + + removeEdge(nodeConnector, false); + removeEdge(peerConnector, isEnabled(peerConnector)); + } + + removeSet = getRemoveSet(prodMap.keySet(), node); + for (NodeConnector nodeConnector : removeSet) { + removeProdEdge(nodeConnector); + } + removeSet = getRemoveSet(readyListHi, node); readyListHi.removeAll(removeSet); removeSet = getRemoveSet(readyListLo, node); readyListLo.removeAll(removeSet); - removeSet = getRemoveSet(waitingList, node); - waitingList.removeAll(removeSet); + removeSet = getRemoveSet(stagingList, node); + stagingList.removeAll(removeSet); - removeSet = getRemoveSet(pendingMap.keySet(), node); + removeSet = getRemoveSet(holdTime.keySet(), node); for (NodeConnector nodeConnector : removeSet) { - pendingMap.remove(nodeConnector); + holdTime.remove(nodeConnector); } - removeSet = getRemoveSet(edgeMap.keySet(), node); - for (NodeConnector nodeConnector : removeSet) { - removeEdge(nodeConnector, false); - } - - removeSet = getRemoveSet(prodMap.keySet(), node); + removeSet = getRemoveSet(elapsedTime.keySet(), node); for (NodeConnector nodeConnector : removeSet) { - removeProdEdge(nodeConnector); + elapsedTime.remove(nodeConnector); } } private void removeDiscovery(NodeConnector nodeConnector) { - readyListHi.remove(nodeConnector); - readyListLo.remove(nodeConnector); - waitingList.remove(nodeConnector); - pendingMap.remove(nodeConnector); + removeNodeConnector(nodeConnector); removeEdge(nodeConnector, false); removeProdEdge(nodeConnector); } private void checkTimeout() { Set removeSet = new HashSet(); - Set retrySet = new HashSet(); int ticks; - Set pendingSet = pendingMap.keySet(); - if (pendingSet != null) { - for (NodeConnector nodeConnector : pendingSet) { - ticks = pendingMap.get(nodeConnector); - pendingMap.put(nodeConnector, ++ticks); - if (ticks > getDiscoveryFinalTimeoutInterval()) { + Set monitorSet = holdTime.keySet(); + if (monitorSet != null) { + for (NodeConnector nodeConnector : monitorSet) { + ticks = holdTime.get(nodeConnector); + holdTime.put(nodeConnector, ++ticks); + if (ticks >= discoveryTimeoutTicks) { // timeout the edge removeSet.add(nodeConnector); logger.trace("Discovery timeout {}", nodeConnector); - } else if (ticks % discoveryTimeoutTicks == 0) { - retrySet.add(nodeConnector); } } } @@ -593,8 +686,24 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa removeEdge(nodeConnector); } - for (NodeConnector nodeConnector : retrySet) { - transmitQ.add(nodeConnector); + Set retrySet = new HashSet(); + Set ncSet = elapsedTime.keySet(); + if ((ncSet != null) && (ncSet.size() > 0)) { + for (NodeConnector nodeConnector : ncSet) { + ticks = elapsedTime.get(nodeConnector); + elapsedTime.put(nodeConnector, ++ticks); + if (ticks >= discoveryThresholdTicks) { + retrySet.add(nodeConnector); + } + } + + for (NodeConnector nodeConnector : retrySet) { + // Allow one more retry + elapsedTime.remove(nodeConnector); + if (connectionOutService.isLocal(nodeConnector.getNode())) { + transmitQ.add(nodeConnector); + } + } } } @@ -627,16 +736,22 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa private void doDiscovery() { if (++discoveryTimerTickCount <= discoveryBatchPauseTicks) { for (NodeConnector nodeConnector : getWorkingSet()) { - transmitQ.add(nodeConnector); + if (connectionOutService.isLocal(nodeConnector.getNode())) { + transmitQ.add(nodeConnector); + // Move to staging area after it's served + if (!stagingList.contains(nodeConnector)) { + stagingList.add(nodeConnector); + } + } } } else if (discoveryTimerTickCount >= discoveryBatchRestartTicks) { discoveryTimerTickCount = 0; - for (NodeConnector nodeConnector : waitingList) { + for (NodeConnector nodeConnector : stagingList) { if (!readyListLo.contains(nodeConnector)) { readyListLo.add(nodeConnector); } } - waitingList.removeAll(readyListLo); + stagingList.removeAll(readyListLo); } } @@ -665,7 +780,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa } if (!isTracked(nodeConnector)) { - waitingList.add(nodeConnector); + stagingList.add(nodeConnector); discoveryConsistencyCheckCorrected++; logger.debug("ConsistencyChecker: add back untracked {}", nodeConnector); continue; @@ -678,14 +793,14 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa // remove stale entries removeSet.clear(); - for (NodeConnector nodeConnector : waitingList) { + for (NodeConnector nodeConnector : stagingList) { if (!isEnabled(nodeConnector)) { removeSet.add(nodeConnector); discoveryConsistencyCheckCorrected++; logger.debug("ConsistencyChecker: remove disabled {}", nodeConnector); } } - waitingList.removeAll(removeSet); + stagingList.removeAll(removeSet); // Get a snapshot of all the existing switches Map switches = this.controller.getSwitches(); @@ -694,7 +809,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa Node node = NodeCreator.createOFNode(sw.getId()); NodeConnector nodeConnector = NodeConnectorCreator.createOFNodeConnector(port.getPortNumber(), node); if (!isTracked(nodeConnector)) { - waitingList.add(nodeConnector); + stagingList.add(nodeConnector); discoveryConsistencyCheckCorrected++; logger.debug("ConsistencyChecker: add back untracked {}", nodeConnector); } @@ -708,15 +823,23 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa } NodeConnector src = edge.getTailNodeConnector(); + NodeConnector dst = edge.getHeadNodeConnector(); if (!src.getType().equals(NodeConnector.NodeConnectorIDType.PRODUCTION)) { - pendingMap.remove(src); + holdTime.put(dst, 0); } else { - NodeConnector dst = edge.getHeadNodeConnector(); agingMap.put(dst, 0); } + elapsedTime.remove(src); + + // fast discovery of the edge in reverse direction + if (!edgeMap.containsKey(dst) && !readyListHi.contains(dst) && !elapsedTime.keySet().contains(dst)) { + moveToReadyListHi(dst); + } + //checking only OF map, since production edge discovery always overwrites any existing edge + UpdateType ut = edgeMap.containsKey(dst) ? UpdateType.CHANGED : UpdateType.ADDED; // notify - updateEdge(edge, UpdateType.ADDED, props); + updateEdge(edge, ut, props); logger.trace("Add edge {}", edge); } @@ -781,18 +904,15 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa * Remove OpenFlow edge */ private void removeEdge(NodeConnector nodeConnector, boolean stillEnabled) { - pendingMap.remove(nodeConnector); - readyListLo.remove(nodeConnector); - readyListHi.remove(nodeConnector); + if (nodeConnector == null) { + return; + } + + removeNodeConnector(nodeConnector); if (stillEnabled) { // keep discovering - if (!waitingList.contains(nodeConnector)) { - waitingList.add(nodeConnector); - } - } else { - // stop it - waitingList.remove(nodeConnector); + stagingList.add(nodeConnector); } Edge edge = null; @@ -818,6 +938,7 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa return; } + this.discoveryListener.notifyEdge(edge, type, props); NodeConnector src = edge.getTailNodeConnector(), dst = edge.getHeadNodeConnector(); @@ -842,8 +963,8 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa private void moveToReadyListHi(NodeConnector nodeConnector) { if (readyListLo.contains(nodeConnector)) { readyListLo.remove(nodeConnector); - } else if (waitingList.contains(nodeConnector)) { - waitingList.remove(nodeConnector); + } else if (stagingList.contains(nodeConnector)) { + stagingList.remove(nodeConnector); } readyListHi.add(nodeConnector); } @@ -857,18 +978,15 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa return discoveryConsistencyCheckMultiple * discoveryBatchRestartTicks; } - private int getDiscoveryFinalTimeoutInterval() { - return (discoveryRetry + 1) * discoveryTimeoutTicks; - } - @Override public String getHelp() { StringBuffer help = new StringBuffer(); help.append("---Topology Discovery---\n"); help.append("\t prlh - Print readyListHi entries\n"); help.append("\t prll - Print readyListLo entries\n"); - help.append("\t pwl - Print waitingList entries\n"); - help.append("\t ppl - Print pendingList entries\n"); + help.append("\t psl - Print stagingList entries\n"); + help.append("\t pht - Print hold time\n"); + help.append("\t pet - Print elapsed time\n"); help.append("\t ptick - Print tick time in msec\n"); help.append("\t pcc - Print CC info\n"); help.append("\t psize - Print sizes of all the lists\n"); @@ -879,8 +997,6 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa help.append("\t sports [ports] - Set/show max ports per batch\n"); help.append("\t spause [ticks] - Set/show pause period\n"); help.append("\t sdi [ticks] - Set/show discovery interval in ticks\n"); - help.append("\t stm [ticks] - Set/show per timeout ticks\n"); - help.append("\t sretry [count] - Set/show num of retries\n"); help.append("\t addsw - Add a switch\n"); help.append("\t remsw - Remove a switch\n"); help.append("\t page - Print aging info\n"); @@ -896,42 +1012,69 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa return help.toString(); } + private List sortList(Collection ncs) { + List ncStrArray = new ArrayList(); + for (NodeConnector nc : ncs) { + ncStrArray.add(nc.toString()); + } + Collections.sort(ncStrArray); + + List sortedNodeConnectors = new ArrayList(); + for (String ncStr : ncStrArray) { + sortedNodeConnectors.add(NodeConnector.fromString(ncStr)); + } + + return sortedNodeConnectors; + } + public void _prlh(CommandInterpreter ci) { - ci.println("ReadyListHi\n"); - for (NodeConnector nodeConnector : readyListHi) { + ci.println("readyListHi\n"); + for (NodeConnector nodeConnector : sortList(readyListHi)) { if (nodeConnector == null) { continue; } ci.println(nodeConnector); } + ci.println("Total number of Node Connectors: " + readyListHi.size()); } public void _prll(CommandInterpreter ci) { - ci.println("ReadyListLo\n"); - for (NodeConnector nodeConnector : readyListLo) { + ci.println("readyListLo\n"); + for (NodeConnector nodeConnector : sortList(readyListLo)) { if (nodeConnector == null) { continue; } ci.println(nodeConnector); } + ci.println("Total number of Node Connectors: " + readyListLo.size()); } - public void _pwl(CommandInterpreter ci) { - ci.println("WaitingList\n"); - for (NodeConnector nodeConnector : waitingList) { + public void _psl(CommandInterpreter ci) { + ci.println("stagingList\n"); + for (NodeConnector nodeConnector : sortList(stagingList)) { if (nodeConnector == null) { continue; } ci.println(nodeConnector); } + ci.println("Total number of Node Connectors: " + stagingList.size()); + } + + public void _pht(CommandInterpreter ci) { + ci.println(" NodeConnector Last rx LLDP (sec)"); + for (ConcurrentMap.Entry entry: holdTime.entrySet()) { + ci.println(entry.getKey() + "\t\t" + entry.getValue() * (discoveryTimerTick / 1000)); + } + ci.println("\nSize: " + holdTime.size() + "\tTimeout: " + discoveryTimeoutTicks * (discoveryTimerTick / 1000) + + " sec"); } - public void _ppl(CommandInterpreter ci) { - ci.println("pendingMap\n"); - ci.println(" NodeConnector Last rx LLDP (s)"); - for (ConcurrentMap.Entry entry: pendingMap.entrySet()) { - ci.println(entry.getKey() + "\t\t" + entry.getValue()); + public void _pet(CommandInterpreter ci) { + ci.println(" NodeConnector Elapsed Time (sec)"); + for (ConcurrentMap.Entry entry: elapsedTime.entrySet()) { + ci.println(entry.getKey() + "\t\t" + entry.getValue() * (discoveryTimerTick / 1000)); } + ci.println("\nSize: " + elapsedTime.size() + "\tThreshold: " + DiscoveryPeriod.THRESHOLD.getTime() + " sec"); } public void _ptick(CommandInterpreter ci) { @@ -951,16 +1094,14 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa } public void _ptm(CommandInterpreter ci) { - ci.println("Final timeout ticks " + getDiscoveryFinalTimeoutInterval()); - ci.println("Per timeout ticks " + discoveryTimeoutTicks); - ci.println("Number of retries after initial timeout " + discoveryRetry); + ci.println("Timeout " + discoveryTimeoutTicks + " ticks, " + discoveryTimerTick / 1000 + " sec per tick."); } public void _psize(CommandInterpreter ci) { ci.println("readyListLo size " + readyListLo.size() + "\n" + "readyListHi size " + readyListHi.size() + "\n" - + "waitingList size " + waitingList.size() + "\n" + "pendingMap size " + pendingMap.size() + "\n" + + "stagingList size " + stagingList.size() + "\n" + "holdTime size " + holdTime.size() + "\n" + "edgeMap size " + edgeMap.size() + "\n" + "prodMap size " + prodMap.size() + "\n" + "agingMap size " - + agingMap.size()); + + agingMap.size() + "\n" + "elapsedTime size " + elapsedTime.size()); } public void _page(CommandInterpreter ci) { @@ -1105,14 +1246,15 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa public void _spause(CommandInterpreter ci) { String val = ci.nextArgument(); String out = "Please enter pause period less than " + discoveryBatchRestartTicks + ". Current pause period is " - + discoveryBatchPausePeriod + " pause tick is " + discoveryBatchPauseTicks + "."; + + discoveryBatchPausePeriod + " ticks, pause at " + discoveryBatchPauseTicks + " ticks, " + + discoveryTimerTick / 1000 + " sec per tick."; if (val != null) { try { int pause = Integer.parseInt(val); if (pause < discoveryBatchRestartTicks) { discoveryBatchPausePeriod = pause; - discoveryBatchPauseTicks = discoveryBatchRestartTicks - discoveryBatchPausePeriod; + discoveryBatchPauseTicks = getDiscoveryPauseInterval(); return; } } catch (Exception e) { @@ -1124,17 +1266,25 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa public void _sdi(CommandInterpreter ci) { String val = ci.nextArgument(); - String out = "Please enter discovery interval greater than " + discoveryBatchPausePeriod - + ". Current value is " + discoveryBatchRestartTicks + "."; + String out = "Please enter discovery interval in ticks. Current value is " + discoveryBatchRestartTicks + " ticks, " + + discoveryTimerTick / 1000 + " sec per tick."; if (val != null) { try { - int restart = Integer.parseInt(val); - if (restart > discoveryBatchPausePeriod) { - discoveryBatchRestartTicks = restart; - discoveryBatchPauseTicks = discoveryBatchRestartTicks - discoveryBatchPausePeriod; - return; + int ticks; + Set monitorSet = holdTime.keySet(); + if (monitorSet != null) { + for (NodeConnector nodeConnector : monitorSet) { + holdTime.put(nodeConnector, 0); + } } + + ticks = Integer.parseInt(val); + DiscoveryPeriod.INTERVAL.setTick(ticks); + discoveryBatchRestartTicks = getDiscoveryInterval(); + discoveryBatchPauseTicks = getDiscoveryPauseInterval(); + discoveryTimeoutTicks = getDiscoveryTimeout(); + return; } catch (Exception e) { } } @@ -1155,38 +1305,6 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa return; } - public void _sretry(CommandInterpreter ci) { - String val = ci.nextArgument(); - if (val == null) { - ci.println("Please enter number of retries. Current value is " + discoveryRetry); - return; - } - try { - discoveryRetry = Integer.parseInt(val); - } catch (Exception e) { - ci.println("Please enter a valid number"); - } - return; - } - - public void _stm(CommandInterpreter ci) { - String val = ci.nextArgument(); - String out = "Please enter timeout tick value less than " + discoveryBatchRestartTicks + ". Current value is " - + discoveryTimeoutTicks; - if (val != null) { - try { - int timeout = Integer.parseInt(val); - if (timeout < discoveryBatchRestartTicks) { - discoveryTimeoutTicks = timeout; - return; - } - } catch (Exception e) { - } - } - - ci.println(out); - } - public void _addsw(CommandInterpreter ci) { String val = ci.nextArgument(); Long sid; @@ -1343,11 +1461,25 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa } } + void setIPluginOutConnectionService(IPluginOutConnectionService s) { + connectionOutService = s; + } + + void unsetIPluginOutConnectionService(IPluginOutConnectionService s) { + if (connectionOutService == s) { + connectionOutService = null; + } + } + private void initDiscoveryPacket() { // Create LLDP ChassisID TLV chassisIdTlv = new LLDPTLV(); chassisIdTlv.setType(LLDPTLV.TLVType.ChassisID.getValue()); + // Create LLDP SystemName TLV + systemNameTlv = new LLDPTLV(); + systemNameTlv.setType(LLDPTLV.TLVType.SystemName.getValue()); + // Create LLDP PortID TLV portIdTlv = new LLDPTLV(); portIdTlv.setType(LLDPTLV.TLVType.PortID.getValue()); @@ -1372,13 +1504,22 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa readyListHi = new CopyOnWriteArrayList(); readyListLo = new CopyOnWriteArrayList(); - waitingList = new CopyOnWriteArrayList(); - pendingMap = new ConcurrentHashMap(); + stagingList = new CopyOnWriteArrayList(); + holdTime = new ConcurrentHashMap(); + elapsedTime = new ConcurrentHashMap(); edgeMap = new ConcurrentHashMap(); agingMap = new ConcurrentHashMap(); prodMap = new ConcurrentHashMap(); discoverySnoopingDisableList = new CopyOnWriteArrayList(); + discoveryBatchRestartTicks = getDiscoveryInterval(); + discoveryBatchPauseTicks = getDiscoveryPauseInterval(); + discoveryTimeoutTicks = getDiscoveryTimeout(); + discoveryThresholdTicks = getDiscoveryThreshold(); + discoveryAgeoutTicks = getDiscoveryAgeout(); + discoveryConsistencyCheckTickCount = discoveryBatchPauseTicks; + discoveryBatchMaxPorts = getDiscoveryBatchMaxPorts(); + discoveryTimer = new Timer("DiscoveryService"); discoveryTimerTask = new DiscoveryTimerTask(); @@ -1399,8 +1540,8 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa transmitQ = null; readyListHi = null; readyListLo = null; - waitingList = null; - pendingMap = null; + stagingList = null; + holdTime = null; edgeMap = null; agingMap = null; prodMap = null; @@ -1476,63 +1617,99 @@ public class DiscoveryService implements IInventoryShimExternalListener, IDataPa return sourceMac; } + private int getDiscoveryTicks(DiscoveryPeriod dp, String val) { + if (dp == null) { + return 0; + } + + if (val != null) { + try { + dp.setTime(Integer.parseInt(val)); + } catch (Exception e) { + } + } + + return dp.getTick(); + } + /** * This method returns the interval which determines how often the discovery - * packets will be sent. Default is 300 seconds. + * packets will be sent. * - * @return The discovery interval in second + * @return The discovery interval in ticks */ private int getDiscoveryInterval() { - String elapsedTime = System.getProperty("of.discoveryInterval"); - int rv = 300; + String intvl = System.getProperty("of.discoveryInterval"); + return getDiscoveryTicks(DiscoveryPeriod.INTERVAL, intvl); + } - try { - if (elapsedTime != null) { - rv = Integer.parseInt(elapsedTime); + /** + * This method returns the timeout value in receiving subsequent discovery packets on a port. + * + * @return The discovery timeout in ticks + */ + private int getDiscoveryTimeout() { + String val = System.getProperty("of.discoveryTimeoutMultiple"); + int multiple = 2; + + if (val != null) { + try { + multiple = Integer.parseInt(val); + } catch (Exception e) { } - } catch (Exception e) { } + return getDiscoveryInterval() * multiple + 3; + } - return rv; + /** + * This method returns the user configurable threshold value + * + * @return The discovery threshold value in ticks + */ + private int getDiscoveryThreshold() { + String val = System.getProperty("of.discoveryThreshold"); + return getDiscoveryTicks(DiscoveryPeriod.THRESHOLD, val); } /** - * This method returns the timeout value in waiting for response of a - * discovery query. Default is 60 seconds. + * This method returns the discovery entry aging time in ticks. * - * @return The discovery timeout in second + * @return The aging time in ticks */ - private int getDiscoveryTimeout() { - String elapsedTime = System.getProperty("of.discoveryTimeout"); - int rv = 60; + private int getDiscoveryAgeout() { + return getDiscoveryTicks(DiscoveryPeriod.AGEOUT, null); + } - try { - if (elapsedTime != null) { - rv = Integer.parseInt(elapsedTime); - } - } catch (Exception e) { + /** + * This method returns the pause interval + * + * @return The pause interval in ticks + */ + private int getDiscoveryPauseInterval() { + if (discoveryBatchRestartTicks > discoveryBatchPausePeriod) { + return discoveryBatchRestartTicks - discoveryBatchPausePeriod; + } else { + return discoveryBatchRestartTicks - 1; } - - return rv; } /** - * This method returns the number of retries after the initial discovery - * packet is not received within the timeout period. Default is 2 times. + * This method returns the user configurable maximum number of ports handled + * in one discovery batch. * - * @return The number of discovery retries + * @return The maximum number of ports */ - private int getDiscoveryRetry() { - String retry = System.getProperty("of.discoveryRetry"); - int rv = 2; + private int getDiscoveryBatchMaxPorts() { + String val = System.getProperty("of.discoveryBatchMaxPorts"); + int ports = 512; - if (retry != null) { + if (val != null) { try { - rv = Integer.parseInt(retry); + ports = Integer.parseInt(val); } catch (Exception e) { } } - - return rv; + return ports; } + }