X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FStatisticsProvider.java;h=8dea40473d57eed4583742844110897f5067e11f;hp=ab5d20a951dd279a26b4abdc8068be958f339c21;hb=fa1fa1e80351e6f86e81f95d5c50a0521d0cbb93;hpb=f08d2774c06e55e377191b027ec9131921977e70 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 ab5d20a951..8dea40473d 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 @@ -8,17 +8,18 @@ package org.opendaylight.controller.md.statistics.manager; import java.util.ArrayList; +import java.util.Collection; import java.util.List; 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; @@ -64,6 +65,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 +94,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; @@ -129,14 +130,11 @@ public class StatisticsProvider implements AutoCloseable { 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 +142,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 +180,7 @@ public class StatisticsProvider implements AutoCloseable { public void run() { while(true){ try { - for(NodeStatisticsHandler nodeStatisticsAger : statisticsCache.values()){ + for(NodeStatisticsHandler nodeStatisticsAger : handlers.values()){ nodeStatisticsAger.cleanStaleStatistics(); } multipartMessageManager.cleanStaleTransactionIds(); @@ -191,10 +201,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,33 +235,23 @@ 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.getTargetNodeKey()); } } - public void sendStatisticsRequestsToNode(Node targetNode){ + private void sendStatisticsRequestsToNode(NodeKey targetNode){ 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).toInstance(); NodeRef targetNodeRef = new NodeRef(targetInstanceId); try{ if(flowStatsService != null){ - sendAggregateFlowsStatsFromAllTablesRequest(targetNode.getKey()); + sendAggregateFlowsStatsFromAllTablesRequest(targetNode); sendAllFlowsStatsFromAllTablesRequest(targetNodeRef); } if(flowTableStatsService != null){ @@ -280,7 +277,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 +291,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,7 +320,7 @@ public class StatisticsProvider implements AutoCloseable { } - public void sendAggregateFlowsStatsFromAllTablesRequest(NodeKey targetNodeKey) throws InterruptedException, ExecutionException{ + private void sendAggregateFlowsStatsFromAllTablesRequest(NodeKey targetNodeKey) throws InterruptedException, ExecutionException{ List tablesId = getTablesFromNode(targetNodeKey); @@ -337,7 +334,7 @@ public class StatisticsProvider implements AutoCloseable { } } - 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 +350,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 +363,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 +390,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 +418,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); @@ -457,22 +454,11 @@ public class StatisticsProvider implements AutoCloseable { */ public final NodeStatisticsHandler getStatisticsHandler(final NodeId nodeId) { Preconditions.checkNotNull(nodeId); - NodeStatisticsHandler ager = statisticsCache.get(nodeId); - if (ager == null) { - ager = new NodeStatisticsHandler(this, new NodeKey(nodeId)); - statisticsCache.put(nodeId, ager); + NodeStatisticsHandler handler = handlers.get(nodeId); + if (handler == null) { + spLogger.info("Attempted to get non-existing handler for {}", nodeId); } - - 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(); + return handler; } private List getTablesFromNode(NodeKey nodeKey){ @@ -496,24 +482,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(key); + } } + 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()); + } + } + } }