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%2FTopologyServiceShim.java;h=99501c280a97a04af2f181c003fdab6a5bb2e5df;hp=af502a2177d12c89101ca5b2363f90a9eeabe4da;hb=86d84c6a9e3f0e0b8b17d81c9b27888885944163;hpb=44331939251d6c9f800f63076e9d51bd8263b526 diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java index af502a2177..99501c280a 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.protocol_plugin.openflow.internal; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -24,6 +25,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.eclipse.osgi.framework.console.CommandInterpreter; import org.eclipse.osgi.framework.console.CommandProvider; +import org.opendaylight.controller.protocol_plugin.openflow.IDiscoveryListener; import org.opendaylight.controller.protocol_plugin.openflow.IInventoryShimExternalListener; import org.opendaylight.controller.protocol_plugin.openflow.IOFStatisticsManager; import org.opendaylight.controller.protocol_plugin.openflow.IRefreshInternalProvider; @@ -43,7 +45,7 @@ import org.opendaylight.controller.sal.core.NodeConnector; import org.opendaylight.controller.sal.core.Property; import org.opendaylight.controller.sal.core.State; import org.opendaylight.controller.sal.core.UpdateType; -import org.opendaylight.controller.sal.discovery.IDiscoveryService; +import org.opendaylight.controller.sal.topology.TopoEdgeUpdate; import org.opendaylight.controller.sal.utils.GlobalConstants; /** @@ -51,9 +53,9 @@ import org.opendaylight.controller.sal.utils.GlobalConstants; * OpenFlow core to various listeners. The notifications are filtered based on * container configurations. */ -public class TopologyServiceShim implements IDiscoveryService, - IContainerListener, CommandProvider, IRefreshInternalProvider, - IInventoryShimExternalListener { +public class TopologyServiceShim implements IDiscoveryListener, + IContainerListener, CommandProvider, IRefreshInternalProvider, + IInventoryShimExternalListener { protected static final Logger logger = LoggerFactory .getLogger(TopologyServiceShim.class); private ConcurrentMap topologyServiceShimListeners = new ConcurrentHashMap(); @@ -76,43 +78,71 @@ public class TopologyServiceShim implements IDiscoveryService, class NotifyEntry { String container; - Pair> edgeProps; - UpdateType type; + List teuList; - NotifyEntry(String container, Pair> edgeProps, - UpdateType type) { + public NotifyEntry(String container, TopoEdgeUpdate teu) { this.container = container; - this.edgeProps = edgeProps; - this.type = type; + this.teuList = new ArrayList(); + if (teu != null) { + this.teuList.add(teu); + } + } + + public NotifyEntry(String container, List teuList) { + this.container = container; + this.teuList = new ArrayList(); + if (teuList != null) { + this.teuList.addAll(teuList); + } } } class TopologyNotify implements Runnable { private final BlockingQueue notifyQ; + private NotifyEntry entry; + private Map> teuMap = new HashMap>(); + private List teuList; + private boolean notifyListeners; TopologyNotify(BlockingQueue notifyQ) { this.notifyQ = notifyQ; } + @Override public void run() { while (true) { try { - NotifyEntry entry = notifyQ.take(); + teuMap.clear(); + notifyListeners = false; + while (!notifyQ.isEmpty()) { + entry = notifyQ.take(); + teuList = teuMap.get(entry.container); + if (teuList == null) { + teuList = new ArrayList(); + } + // group all the updates together + teuList.addAll(entry.teuList); + teuMap.put(entry.container, teuList); + notifyListeners = true; + } - ITopologyServiceShimListener topologServiceShimListener = topologyServiceShimListeners - .get(entry.container); - topologServiceShimListener.edgeUpdate( - entry.edgeProps.getLeft(), entry.type, - entry.edgeProps.getRight()); + if (notifyListeners) { + for (String container : teuMap.keySet()) { + // notify the listener + topologyServiceShimListeners.get(container) + .edgeUpdate(teuMap.get(container)); + } + } - entry = null; + Thread.sleep(100); } catch (InterruptedException e1) { - logger.warn("TopologyNotify interrupted {}", e1.getMessage()); + logger.warn("TopologyNotify interrupted {}", + e1.getMessage()); if (shuttingDown) { return; } } catch (Exception e2) { - logger.error("",e2); + logger.error("", e2); } } } @@ -135,6 +165,7 @@ public class TopologyServiceShim implements IDiscoveryService, this.notifyQ = notifyQ; } + @Override public void run() { while (true) { try { @@ -165,7 +196,7 @@ public class TopologyServiceShim implements IDiscoveryService, return; } } catch (Exception e2) { - logger.error("",e2); + logger.error("", e2); } } } @@ -174,7 +205,7 @@ public class TopologyServiceShim implements IDiscoveryService, /** * Function called by the dependency manager when all the required * dependencies are satisfied - * + * */ void init() { logger.trace("Init called"); @@ -284,7 +315,7 @@ public class TopologyServiceShim implements IDiscoveryService, * Function called by the dependency manager when at least one dependency * become unsatisfied or when the component is shutting down because for * example bundle is being stopped. - * + * */ void destroy() { logger.trace("DESTROY called!"); @@ -295,7 +326,7 @@ public class TopologyServiceShim implements IDiscoveryService, /** * Function called by dependency manager after "init ()" is called and after * the services provided by the class are registered in the service registry - * + * */ void start() { logger.trace("START called!"); @@ -309,7 +340,7 @@ public class TopologyServiceShim implements IDiscoveryService, * Function called by the dependency manager before the services exported by * the component are unregistered, this will be followed by a "destroy ()" * calls - * + * */ void stop() { logger.trace("STOP called!"); @@ -353,7 +384,8 @@ public class TopologyServiceShim implements IDiscoveryService, && this.topologyServiceShimListeners.get(containerName).equals( s)) { this.topologyServiceShimListeners.remove(containerName); - logger.trace("Removed topologyServiceShimListener for container: {}", + logger.trace( + "Removed topologyServiceShimListener for container: {}", containerName); } } @@ -370,6 +402,7 @@ public class TopologyServiceShim implements IDiscoveryService, private void removeNodeConnector(String container, NodeConnector nodeConnector) { + List teuList = new ArrayList(); Map>> edgePropsMap = edgeMap .get(container); if (edgePropsMap == null) { @@ -381,7 +414,8 @@ public class TopologyServiceShim implements IDiscoveryService, if (edgeProps == null) { return; } - notifyEdge(container, edgeProps.getLeft(), UpdateType.REMOVED, null); + teuList.add(new TopoEdgeUpdate(edgeProps.getLeft(), null, + UpdateType.REMOVED)); // Remove edge in another direction edgeProps = edgePropsMap @@ -389,52 +423,130 @@ public class TopologyServiceShim implements IDiscoveryService, if (edgeProps == null) { return; } - notifyEdge(container, edgeProps.getLeft(), UpdateType.REMOVED, null); + teuList.add(new TopoEdgeUpdate(edgeProps.getLeft(), null, + UpdateType.REMOVED)); + + // Update in one shot + notifyEdge(container, teuList); } - private void notifyEdge(String container, Edge edge, UpdateType type, - Set props) { + /** + * Update local cache and return true if it needs to notify upper layer + * Topology listeners. + * + * @param container + * The network container + * @param edge + * The edge + * @param type + * The update type + * @param props + * The edge properties + * @return true if it needs to notify upper layer Topology listeners + */ + private boolean updateLocalEdgeMap(String container, Edge edge, + UpdateType type, Set props) { ConcurrentMap>> edgePropsMap = edgeMap .get(container); NodeConnector src = edge.getTailNodeConnector(); Pair> edgeProps = new ImmutablePair>( edge, props); + boolean rv = false; switch (type) { case ADDED: case CHANGED: if (edgePropsMap == null) { edgePropsMap = new ConcurrentHashMap>>(); + rv = true; } else { if (edgePropsMap.containsKey(src) && edgePropsMap.get(src).equals(edgeProps)) { - // Entry already exists. Return here. - return; + // Entry already exists. No update. + rv = false; + } else { + rv = true; } } - edgePropsMap.put(src, edgeProps); - edgeMap.put(container, edgePropsMap); + if (rv) { + edgePropsMap.put(src, edgeProps); + edgeMap.put(container, edgePropsMap); + } break; case REMOVED: - if (edgePropsMap != null) { + if ((edgePropsMap != null) && edgePropsMap.containsKey(src)) { edgePropsMap.remove(src); if (edgePropsMap.isEmpty()) { edgeMap.remove(container); } else { edgeMap.put(container, edgePropsMap); } + rv = true; } break; default: - logger.debug("notifyEdge: invalid {} for Edge {} in container {}", - type, edge, container); + logger.debug( + "notifyLocalEdgeMap: invalid {} for Edge {} in container {}", + new Object[] { type.getName(), edge, container }); + } + + if (rv) { + logger.debug( + "notifyLocalEdgeMap: {} for Edge {} in container {}", + new Object[] { type.getName(), edge, container }); + } + + return rv; + } + + private void notifyEdge(String container, Edge edge, UpdateType type, + Set props) { + boolean notifyListeners; + + // Update local cache + notifyListeners = updateLocalEdgeMap(container, edge, type, props); + + // Prepare to update TopologyService + if (notifyListeners) { + notifyQ.add(new NotifyEntry(container, new TopoEdgeUpdate(edge, props, + type))); + logger.debug("notifyEdge: {} Edge {} in container {}", + new Object[] { type.getName(), edge, container }); + } + } + + private void notifyEdge(String container, List etuList) { + if (etuList == null) { return; } - notifyQ.add(new NotifyEntry(container, edgeProps, type)); + Edge edge; + UpdateType type; + List etuNotifyList = new ArrayList(); + boolean notifyListeners = false, rv; + + for (TopoEdgeUpdate etu : etuList) { + edge = etu.getEdge(); + type = etu.getUpdateType(); + + // Update local cache + rv = updateLocalEdgeMap(container, edge, type, etu.getProperty()); + if (rv) { + if (!notifyListeners) { + notifyListeners = true; + } + etuNotifyList.add(etu); + logger.debug( + "notifyEdge(TopoEdgeUpdate): {} Edge {} in container {}", + new Object[] { type.getName(), edge, container }); + } + } - logger.debug("notifyEdge: {} Edge {} in container {}", - type, edge, container); + // Prepare to update TopologyService + if (notifyListeners) { + notifyQ.add(new NotifyEntry(container, etuNotifyList)); + logger.debug("notifyEdge(TopoEdgeUpdate): add notifyQ"); + } } @Override @@ -572,9 +684,12 @@ public class TopologyServiceShim implements IDiscoveryService, } long bw = 0; - for (Property prop : edgeProps.getRight()) { - if (prop.getName().equals(Bandwidth.BandwidthPropName)) { - bw = ((Bandwidth) prop).getValue(); + Set props = edgeProps.getRight(); + if (props != null) { + for (Property prop : props) { + if (prop.getName().equals(Bandwidth.BandwidthPropName)) { + bw = ((Bandwidth) prop).getValue(); + } } } count++; @@ -599,11 +714,11 @@ public class TopologyServiceShim implements IDiscoveryService, * pushes the updates to ALL the applications that have registered as * listeners for this service. SAL has no way of knowing which application * requested for the refresh. - * + * * As an example of this case, is stopping and starting the Topology * Manager. When the topology Manager is stopped, and restarted, it will no * longer have the latest topology. Hence, a request is sent here. - * + * * @param containerName * @return void */ @@ -614,18 +729,37 @@ public class TopologyServiceShim implements IDiscoveryService, bulkNotifyQ.add(containerName); } + /** + * Retrieve/construct edge map for a given container + * + * @param containerName + * the container name + * @return the edges and their properties + */ + private Map>> getEdgeMap(String containerName) { + Map>> edgePropMap = null; + + /* + * When container is freshly created, need to construct map based on global map. + */ + edgePropMap = edgeMap.get(containerName); + + return edgePropMap; + } + /** * Reading the current topology database, the method will replay all the * edge updates for the ITopologyServiceShimListener instance in the given * container, which will in turn publish them toward SAL. - * + * * @param containerName + * the container name */ private void TopologyBulkUpdate(String containerName) { Map>> edgePropMap = null; logger.debug("Try bulk update for container:{}", containerName); - edgePropMap = edgeMap.get(containerName); + edgePropMap = getEdgeMap(containerName); if (edgePropMap == null) { logger.debug("No edges known for container:{}", containerName); return; @@ -638,14 +772,18 @@ public class TopologyServiceShim implements IDiscoveryService, return; } int i = 0; + List teuList = new ArrayList(); for (Pair> edgeProps : edgePropMap.values()) { if (edgeProps != null) { i++; + teuList.add(new TopoEdgeUpdate(edgeProps.getLeft(), edgeProps + .getRight(), UpdateType.ADDED)); logger.trace("Add edge {}", edgeProps.getLeft()); - topologServiceShimListener.edgeUpdate(edgeProps.getLeft(), - UpdateType.ADDED, edgeProps.getRight()); } } + if (i > 0) { + topologServiceShimListener.edgeUpdate(teuList); + } logger.debug("Sent {} updates", i); } @@ -663,7 +801,7 @@ public class TopologyServiceShim implements IDiscoveryService, if (conList != null) { containers.addAll(conList); } - + switch (type) { case ADDED: break;