X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FStatisticsProvider.java;h=ce2a0b3eeb40bdc4f0be621730e98b472a3988e0;hb=7d1a7a08f2618ec0de1a97b561225c899d5c5715;hp=1269c1c6d8287fda41ec1fce515895e32fa50abd;hpb=5d845929062a5370b50b2d059fb2a0fa33340896;p=controller.git diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java index 1269c1c6d8..ce2a0b3eeb 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsProvider.java @@ -7,24 +7,24 @@ */ package org.opendaylight.controller.md.statistics.manager; -import java.util.ArrayList; -import java.util.List; +import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.eclipse.xtext.xbase.lib.Exceptions; import org.opendaylight.controller.md.statistics.manager.MultipartMessageManager.StatsRequestType; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; +import org.opendaylight.controller.sal.binding.api.data.DataChangeListener; import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.TableKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForAllFlowsOutput; @@ -64,6 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216. import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetQueueStatisticsFromGivenPortInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetQueueStatisticsFromGivenPortOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.OpendaylightQueueStatisticsService; +import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -92,11 +93,10 @@ public class StatisticsProvider implements AutoCloseable { private static final Logger spLogger = LoggerFactory.getLogger(StatisticsProvider.class); private final MultipartMessageManager multipartMessageManager = new MultipartMessageManager(); - private final InstanceIdentifier nodesIdentifier = InstanceIdentifier.builder(Nodes.class).toInstance(); private final DataProviderService dps; //Local caching of stats - private final ConcurrentMap statisticsCache = new ConcurrentHashMap<>(); + private final ConcurrentMap handlers = new ConcurrentHashMap<>(); private OpendaylightGroupStatisticsService groupStatsService; @@ -125,18 +125,15 @@ public class StatisticsProvider implements AutoCloseable { return multipartMessageManager; } - private final StatisticsUpdateCommiter updateCommiter = new StatisticsUpdateCommiter(StatisticsProvider.this); + private final StatisticsListener updateCommiter = new StatisticsListener(StatisticsProvider.this); private Registration listenerRegistration; - public void start(final DataBrokerService dbs, final NotificationProviderService nps, final RpcConsumerRegistry rpcRegistry) { - - this.listenerRegistration = nps.registerNotificationListener(this.updateCommiter); + private ListenerRegistration flowCapableTrackerRegistration; - statsUpdateHandler = new StatisticsUpdateHandler(StatisticsProvider.this); - registerDataStoreUpdateListener(dbs); + public void start(final DataBrokerService dbs, final NotificationProviderService nps, final RpcConsumerRegistry rpcRegistry) { - // Get Group/Meter statistics service instance + // Get Group/Meter statistics service instances groupStatsService = rpcRegistry.getRpcService(OpendaylightGroupStatisticsService.class); meterStatsService = rpcRegistry.getRpcService(OpendaylightMeterStatisticsService.class); flowStatsService = rpcRegistry.getRpcService(OpendaylightFlowStatisticsService.class); @@ -144,6 +141,18 @@ public class StatisticsProvider implements AutoCloseable { flowTableStatsService = rpcRegistry.getRpcService(OpendaylightFlowTableStatisticsService.class); queueStatsService = rpcRegistry.getRpcService(OpendaylightQueueStatisticsService.class); + // Start receiving notifications + this.listenerRegistration = nps.registerNotificationListener(this.updateCommiter); + + // Register for switch connect/disconnect notifications + final InstanceIdentifier fcnId = InstanceIdentifier.builder(Nodes.class) + .child(Node.class).augmentation(FlowCapableNode.class).build(); + this.flowCapableTrackerRegistration = dbs.registerDataChangeListener(fcnId, + new FlowCapableTracker(this, fcnId)); + + statsUpdateHandler = new StatisticsUpdateHandler(StatisticsProvider.this); + registerDataStoreUpdateListener(dbs); + statisticsRequesterThread = new Thread( new Runnable(){ @Override @@ -170,7 +179,7 @@ public class StatisticsProvider implements AutoCloseable { public void run() { while(true){ try { - for(NodeStatisticsAger nodeStatisticsAger : statisticsCache.values()){ + for(NodeStatisticsHandler nodeStatisticsAger : handlers.values()){ nodeStatisticsAger.cleanStaleStatistics(); } multipartMessageManager.cleanStaleTransactionIds(); @@ -191,10 +200,7 @@ public class StatisticsProvider implements AutoCloseable { } private void registerDataStoreUpdateListener(DataBrokerService dbs) { - //Register for Node updates - InstanceIdentifier pathNode = InstanceIdentifier.builder(Nodes.class) - .child(Node.class).toInstance(); - dbs.registerDataChangeListener(pathNode, statsUpdateHandler); + // FIXME: the below should be broken out into StatisticsUpdateHandler //Register for flow updates InstanceIdentifier pathFlow = InstanceIdentifier.builder(Nodes.class).child(Node.class) @@ -228,38 +234,31 @@ public class StatisticsProvider implements AutoCloseable { return dps.beginTransaction(); } - private void statsRequestSender(){ - - List targetNodes = getAllConnectedNodes(); - - if(targetNodes == null) - return; - - - for (Node targetNode : targetNodes){ - - if(targetNode.getAugmentation(FlowCapableNode.class) != null){ - sendStatisticsRequestsToNode(targetNode); - } + private void statsRequestSender() { + for (NodeStatisticsHandler h : handlers.values()) { + sendStatisticsRequestsToNode(h); } } - public void sendStatisticsRequestsToNode(Node targetNode){ + private void sendStatisticsRequestsToNode(NodeStatisticsHandler h) { + NodeKey targetNode = h.getTargetNodeKey(); + spLogger.debug("Send requests for statistics collection to node : {}", targetNode.getId()); - spLogger.debug("Send requests for statistics collection to node : {})",targetNode.getId()); - - InstanceIdentifier targetInstanceId = InstanceIdentifier.builder(Nodes.class).child(Node.class,targetNode.getKey()).toInstance(); + InstanceIdentifier targetInstanceId = InstanceIdentifier.builder(Nodes.class).child(Node.class, targetNode).build(); NodeRef targetNodeRef = new NodeRef(targetInstanceId); try{ - if(flowStatsService != null){ - sendAggregateFlowsStatsFromAllTablesRequest(targetNode.getKey()); - sendAllFlowsStatsFromAllTablesRequest(targetNodeRef); - } if(flowTableStatsService != null){ sendAllFlowTablesStatisticsRequest(targetNodeRef); } + if(flowStatsService != null){ + // FIXME: it does not make sense to trigger this before sendAllFlowTablesStatisticsRequest() + // comes back -- we do not have any tables anyway. + sendAggregateFlowsStatsFromAllTablesRequest(h); + + sendAllFlowsStatsFromAllTablesRequest(targetNodeRef); + } if(portStatsService != null){ sendAllNodeConnectorsStatisticsRequest(targetNodeRef); } @@ -272,7 +271,7 @@ public class StatisticsProvider implements AutoCloseable { sendMeterConfigStatisticsRequest(targetNodeRef); } if(queueStatsService != null){ - sendAllQueueStatsFromAllNodeConnector (targetNodeRef); + sendAllQueueStatsFromAllNodeConnector(targetNodeRef); } }catch(Exception e){ spLogger.error("Exception occured while sending statistics requests : {}", e); @@ -280,7 +279,7 @@ public class StatisticsProvider implements AutoCloseable { } - public void sendAllFlowTablesStatisticsRequest(NodeRef targetNodeRef) throws InterruptedException, ExecutionException { + private void sendAllFlowTablesStatisticsRequest(NodeRef targetNodeRef) throws InterruptedException, ExecutionException { final GetFlowTablesStatisticsInputBuilder input = new GetFlowTablesStatisticsInputBuilder(); @@ -294,7 +293,7 @@ public class StatisticsProvider implements AutoCloseable { } - public void sendAllFlowsStatsFromAllTablesRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ + private void sendAllFlowsStatsFromAllTablesRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ final GetAllFlowsStatisticsFromAllFlowTablesInputBuilder input = new GetAllFlowsStatisticsFromAllFlowTablesInputBuilder(); @@ -323,21 +322,16 @@ public class StatisticsProvider implements AutoCloseable { } - public void sendAggregateFlowsStatsFromAllTablesRequest(NodeKey targetNodeKey) throws InterruptedException, ExecutionException{ - - List tablesId = getTablesFromNode(targetNodeKey); + private void sendAggregateFlowsStatsFromAllTablesRequest(final NodeStatisticsHandler h) throws InterruptedException, ExecutionException{ + final Collection tables = h.getKnownTables(); + spLogger.debug("Node {} supports {} table(s)", h, tables.size()); - if(tablesId.size() != 0){ - for(Short id : tablesId){ - - sendAggregateFlowsStatsFromTableRequest(targetNodeKey,id); - } - }else{ - spLogger.debug("No details found in data store for flow tables associated with Node {}",targetNodeKey); + for (TableKey key : h.getKnownTables()) { + sendAggregateFlowsStatsFromTableRequest(h.getTargetNodeKey(), key.getId().shortValue()); } } - public void sendAggregateFlowsStatsFromTableRequest(NodeKey targetNodeKey,Short tableId) throws InterruptedException, ExecutionException{ + private void sendAggregateFlowsStatsFromTableRequest(NodeKey targetNodeKey,Short tableId) throws InterruptedException, ExecutionException{ spLogger.debug("Send aggregate stats request for flow table {} to node {}",tableId,targetNodeKey); GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder input = @@ -353,7 +347,7 @@ public class StatisticsProvider implements AutoCloseable { , StatsRequestType.AGGR_FLOW); } - public void sendAllNodeConnectorsStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ + private void sendAllNodeConnectorsStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ final GetAllNodeConnectorsStatisticsInputBuilder input = new GetAllNodeConnectorsStatisticsInputBuilder(); @@ -366,7 +360,7 @@ public class StatisticsProvider implements AutoCloseable { } - public void sendAllGroupStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ + private void sendAllGroupStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ final GetAllGroupStatisticsInputBuilder input = new GetAllGroupStatisticsInputBuilder(); @@ -393,7 +387,7 @@ public class StatisticsProvider implements AutoCloseable { } - public void sendAllMeterStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ + private void sendAllMeterStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ GetAllMeterStatisticsInputBuilder input = new GetAllMeterStatisticsInputBuilder(); @@ -421,7 +415,7 @@ public class StatisticsProvider implements AutoCloseable { } - public void sendAllQueueStatsFromAllNodeConnector(NodeRef targetNode) throws InterruptedException, ExecutionException { + private void sendAllQueueStatsFromAllNodeConnector(NodeRef targetNode) throws InterruptedException, ExecutionException { GetAllQueuesStatisticsFromAllPortsInputBuilder input = new GetAllQueuesStatisticsFromAllPortsInputBuilder(); input.setNode(targetNode); @@ -455,38 +449,13 @@ public class StatisticsProvider implements AutoCloseable { * @return Node statistics handler for that node. Null if the statistics should * not handled. */ - public final NodeStatisticsAger getStatisticsHandler(final NodeId nodeId) { + public final NodeStatisticsHandler getStatisticsHandler(final NodeId nodeId) { Preconditions.checkNotNull(nodeId); - NodeStatisticsAger ager = statisticsCache.get(nodeId); - if (ager == null) { - ager = new NodeStatisticsAger(this, new NodeKey(nodeId)); - statisticsCache.put(nodeId, ager); - } - - return ager; - } - - private List getAllConnectedNodes(){ - Nodes nodes = (Nodes) dps.readOperationalData(nodesIdentifier); - if(nodes == null) - return null; - - spLogger.debug("Number of connected nodes : {}",nodes.getNode().size()); - return nodes.getNode(); - } - - private List getTablesFromNode(NodeKey nodeKey){ - InstanceIdentifier nodesIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class,nodeKey).augmentation(FlowCapableNode.class).toInstance(); - - FlowCapableNode node = (FlowCapableNode)dps.readOperationalData(nodesIdentifier); - List tablesId = new ArrayList(); - if(node != null && node.getTable()!=null){ - spLogger.debug("Number of tables {} supported by node {}",node.getTable().size(),nodeKey); - for(Table table: node.getTable()){ - tablesId.add(table.getId()); - } + NodeStatisticsHandler handler = handlers.get(nodeId); + if (handler == null) { + spLogger.info("Attempted to get non-existing handler for {}", nodeId); } - return tablesId; + return handler; } @SuppressWarnings("unchecked") @@ -496,24 +465,50 @@ public class StatisticsProvider implements AutoCloseable { return nodeKey.getId(); } - @SuppressWarnings("deprecation") @Override - public void close(){ - + public void close() { try { - spLogger.info("Statistics Provider stopped."); if (this.listenerRegistration != null) { - this.listenerRegistration.close(); - this.statisticsRequesterThread.destroy(); - this.statisticsAgerThread.destroy(); + } + if (this.flowCapableTrackerRegistration != null) { + this.flowCapableTrackerRegistration.close(); + this.flowCapableTrackerRegistration = null; + } + } catch (Exception e) { + spLogger.warn("Failed to stop Statistics Provider completely", e); + } finally { + spLogger.info("Statistics Provider stopped."); + } + } + synchronized void startNodeHandlers(final Collection addedNodes) { + for (NodeKey key : addedNodes) { + if (handlers.containsKey(key.getId())) { + spLogger.warn("Attempted to start already-existing handler for {}, very strange", key.getId()); + continue; } - } catch (Throwable e) { - throw Exceptions.sneakyThrow(e); - } + + final NodeStatisticsHandler h = new NodeStatisticsHandler(this, key); + handlers.put(key.getId(), h); + spLogger.debug("Started node handler for {}", key.getId()); + + // FIXME: this should be in the NodeStatisticsHandler itself + sendStatisticsRequestsToNode(h); + } } + synchronized void stopNodeHandlers(final Collection removedNodes) { + for (NodeKey key : removedNodes) { + final NodeStatisticsHandler s = handlers.remove(key.getId()); + if (s != null) { + spLogger.debug("Stopping node handler for {}", key.getId()); + s.close(); + } else { + spLogger.warn("Attempted to remove non-existing handler for {}, very strange", key.getId()); + } + } + } }