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=8c9b60e43f0b7dc373b3365039ab950f86df6bfc;hp=7432db74eb175fc1e35f1736fe2ea5cd1ae0b2e4;hb=17d82f582a6bc13c78be3b19954ff8c021180e93;hpb=38e4ef09e02d2e1ef4a1a3b1f813783f8a1b7295 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 7432db74eb..8c9b60e43f 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 @@ -9,70 +9,27 @@ package org.opendaylight.controller.md.statistics.manager; import java.util.Collection; import java.util.Timer; -import java.util.TimerTask; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -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; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowsStatisticsFromAllFlowTablesInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAllFlowsStatisticsFromAllFlowTablesOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTableInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTableOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.OpendaylightFlowStatisticsService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.GetFlowTablesStatisticsInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.GetFlowTablesStatisticsOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.OpendaylightFlowTableStatisticsService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.Queue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.queue.rev130925.QueueId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetAllGroupStatisticsInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetAllGroupStatisticsOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescriptionInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescriptionOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.OpendaylightGroupStatisticsService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterConfigStatisticsInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterConfigStatisticsOutput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterStatisticsInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetAllMeterStatisticsOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.OpendaylightMeterStatisticsService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetAllNodeConnectorsStatisticsInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.GetAllNodeConnectorsStatisticsOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.OpendaylightPortStatisticsService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromAllPortsInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.GetAllQueuesStatisticsFromAllPortsOutput; -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; import org.opendaylight.yangtools.yang.binding.NotificationListener; -import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -91,12 +48,9 @@ import com.google.common.base.Preconditions; * */ public class StatisticsProvider implements AutoCloseable { - public static final long STATS_COLLECTION_MILLIS = TimeUnit.SECONDS.toMillis(15); - private static final Logger spLogger = LoggerFactory.getLogger(StatisticsProvider.class); private final ConcurrentMap handlers = new ConcurrentHashMap<>(); - private final MultipartMessageManager multipartMessageManager = new MultipartMessageManager(); private final Timer timer = new Timer("statistics-manager", true); private final DataProviderService dps; @@ -112,23 +66,20 @@ public class StatisticsProvider implements AutoCloseable { private OpendaylightQueueStatisticsService queueStatsService; - private StatisticsUpdateHandler statsUpdateHandler; + private final StatisticsRequestScheduler srScheduler; public StatisticsProvider(final DataProviderService dataService) { this.dps = Preconditions.checkNotNull(dataService); - } - - public MultipartMessageManager getMultipartMessageManager() { - return multipartMessageManager; + this.srScheduler = new StatisticsRequestScheduler(); } private final StatisticsListener updateCommiter = new StatisticsListener(StatisticsProvider.this); - private Registration listenerRegistration; + private ListenerRegistration listenerRegistration; private ListenerRegistration flowCapableTrackerRegistration; - public void start(final DataBrokerService dbs, final NotificationProviderService nps, final RpcConsumerRegistry rpcRegistry) { + public void start(final NotificationProviderService nps, final RpcConsumerRegistry rpcRegistry) { // Get Group/Meter statistics service instances groupStatsService = rpcRegistry.getRpcService(OpendaylightGroupStatisticsService.class); @@ -137,6 +88,7 @@ public class StatisticsProvider implements AutoCloseable { portStatsService = rpcRegistry.getRpcService(OpendaylightPortStatisticsService.class); flowTableStatsService = rpcRegistry.getRpcService(OpendaylightFlowTableStatisticsService.class); queueStatsService = rpcRegistry.getRpcService(OpendaylightQueueStatisticsService.class); + this.srScheduler.start(); // Start receiving notifications this.listenerRegistration = nps.registerNotificationListener(this.updateCommiter); @@ -145,274 +97,12 @@ public class StatisticsProvider implements AutoCloseable { final InstanceIdentifier fcnId = InstanceIdentifier.builder(Nodes.class) .child(Node.class).augmentation(FlowCapableNode.class).build(); spLogger.debug("Registering FlowCapable tracker to {}", fcnId); - this.flowCapableTrackerRegistration = dbs.registerDataChangeListener(fcnId, + this.flowCapableTrackerRegistration = dps.registerDataChangeListener(fcnId, new FlowCapableTracker(this, fcnId)); - statsUpdateHandler = new StatisticsUpdateHandler(StatisticsProvider.this); - registerDataStoreUpdateListener(dbs); - - timer.schedule(new TimerTask() { - @Override - public void run() { - try { - // Send stats requests - statsRequestSender(); - - // Perform cleanup - for(NodeStatisticsHandler nodeStatisticsAger : handlers.values()){ - nodeStatisticsAger.cleanStaleStatistics(); - } - - multipartMessageManager.cleanStaleTransactionIds(); - } catch (RuntimeException e) { - spLogger.warn("Failed to request statistics", e); - } - } - }, 0, STATS_COLLECTION_MILLIS); - - spLogger.debug("Statistics timer task with timer interval : {}ms", STATS_COLLECTION_MILLIS); spLogger.info("Statistics Provider started."); } - private void registerDataStoreUpdateListener(DataBrokerService dbs) { - // FIXME: the below should be broken out into StatisticsUpdateHandler - - //Register for flow updates - InstanceIdentifier pathFlow = InstanceIdentifier.builder(Nodes.class).child(Node.class) - .augmentation(FlowCapableNode.class) - .child(Table.class) - .child(Flow.class).toInstance(); - dbs.registerDataChangeListener(pathFlow, statsUpdateHandler); - - //Register for meter updates - InstanceIdentifier pathMeter = InstanceIdentifier.builder(Nodes.class).child(Node.class) - .augmentation(FlowCapableNode.class) - .child(Meter.class).toInstance(); - - dbs.registerDataChangeListener(pathMeter, statsUpdateHandler); - - //Register for group updates - InstanceIdentifier pathGroup = InstanceIdentifier.builder(Nodes.class).child(Node.class) - .augmentation(FlowCapableNode.class) - .child(Group.class).toInstance(); - dbs.registerDataChangeListener(pathGroup, statsUpdateHandler); - - //Register for queue updates - InstanceIdentifier pathQueue = InstanceIdentifier.builder(Nodes.class).child(Node.class) - .child(NodeConnector.class) - .augmentation(FlowCapableNodeConnector.class) - .child(Queue.class).toInstance(); - dbs.registerDataChangeListener(pathQueue, statsUpdateHandler); - } - - protected DataModificationTransaction startChange() { - return dps.beginTransaction(); - } - - private void statsRequestSender() { - for (NodeStatisticsHandler h : handlers.values()) { - sendStatisticsRequestsToNode(h); - } - } - - private void sendStatisticsRequestsToNode(final NodeStatisticsHandler h) { - NodeKey targetNode = h.getTargetNodeKey(); - spLogger.debug("Send requests for statistics collection to node : {}", targetNode.getId()); - - try{ - if(flowTableStatsService != null){ - sendAllFlowTablesStatisticsRequest(h); - } - 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(h); - } - if(portStatsService != null){ - sendAllNodeConnectorsStatisticsRequest(h); - } - if(groupStatsService != null){ - sendAllGroupStatisticsRequest(h); - sendGroupDescriptionRequest(h.getTargetNodeRef()); - } - if(meterStatsService != null){ - sendAllMeterStatisticsRequest(h); - sendMeterConfigStatisticsRequest(h.getTargetNodeRef()); - } - if(queueStatsService != null){ - sendAllQueueStatsFromAllNodeConnector(h); - } - }catch(Exception e){ - spLogger.error("Exception occured while sending statistics requests : {}", e); - } - } - - - private void sendAllFlowTablesStatisticsRequest(NodeStatisticsHandler h) throws InterruptedException, ExecutionException { - final GetFlowTablesStatisticsInputBuilder input = - new GetFlowTablesStatisticsInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - - Future> response = - flowTableStatsService.getFlowTablesStatistics(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(),response.get().getResult().getTransactionId() - , StatsRequestType.ALL_FLOW_TABLE); - - } - - private void sendAllFlowsStatsFromAllTablesRequest(NodeStatisticsHandler h) throws InterruptedException, ExecutionException{ - final GetAllFlowsStatisticsFromAllFlowTablesInputBuilder input = - new GetAllFlowsStatisticsFromAllFlowTablesInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - - Future> response = - flowStatsService.getAllFlowsStatisticsFromAllFlowTables(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(), response.get().getResult().getTransactionId() - , StatsRequestType.ALL_FLOW); - - } - - public void sendFlowStatsFromTableRequest(NodeRef targetNode,Flow flow) throws InterruptedException, ExecutionException{ - final GetFlowStatisticsFromFlowTableInputBuilder input = - new GetFlowStatisticsFromFlowTableInputBuilder(); - - input.setNode(targetNode); - input.fieldsFrom(flow); - - Future> response = - flowStatsService.getFlowStatisticsFromFlowTable(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(getNodeId(targetNode), response.get().getResult().getTransactionId() - , StatsRequestType.ALL_FLOW); - - } - - private void sendAggregateFlowsStatsFromAllTablesRequest(final NodeStatisticsHandler h) throws InterruptedException, ExecutionException{ - final Collection tables = h.getKnownTables(); - spLogger.debug("Node {} supports {} table(s)", h, tables.size()); - - for (TableKey key : h.getKnownTables()) { - sendAggregateFlowsStatsFromTableRequest(h.getTargetNodeKey(), key.getId().shortValue()); - } - } - - 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 = - new GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder(); - - input.setNode(new NodeRef(InstanceIdentifier.builder(Nodes.class).child(Node.class, targetNodeKey).toInstance())); - input.setTableId(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId(tableId)); - Future> response = - flowStatsService.getAggregateFlowStatisticsFromFlowTableForAllFlows(input.build()); - - multipartMessageManager.setTxIdAndTableIdMapEntry(targetNodeKey.getId(), response.get().getResult().getTransactionId(), tableId); - this.multipartMessageManager.addTxIdToRequestTypeEntry(targetNodeKey.getId(), response.get().getResult().getTransactionId() - , StatsRequestType.AGGR_FLOW); - } - - private void sendAllNodeConnectorsStatisticsRequest(NodeStatisticsHandler h) throws InterruptedException, ExecutionException{ - - final GetAllNodeConnectorsStatisticsInputBuilder input = new GetAllNodeConnectorsStatisticsInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - - Future> response = - portStatsService.getAllNodeConnectorsStatistics(input.build()); - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(), response.get().getResult().getTransactionId() - , StatsRequestType.ALL_PORT); - - } - - private void sendAllGroupStatisticsRequest(NodeStatisticsHandler h) throws InterruptedException, ExecutionException{ - - final GetAllGroupStatisticsInputBuilder input = new GetAllGroupStatisticsInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - - Future> response = - groupStatsService.getAllGroupStatistics(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(), response.get().getResult().getTransactionId() - , StatsRequestType.ALL_GROUP); - - } - - public void sendGroupDescriptionRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ - final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder(); - - input.setNode(targetNode); - - Future> response = - groupStatsService.getGroupDescription(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(getNodeId(targetNode), response.get().getResult().getTransactionId() - , StatsRequestType.GROUP_DESC); - - } - - private void sendAllMeterStatisticsRequest(NodeStatisticsHandler h) throws InterruptedException, ExecutionException{ - - GetAllMeterStatisticsInputBuilder input = new GetAllMeterStatisticsInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - - Future> response = - meterStatsService.getAllMeterStatistics(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(), response.get().getResult().getTransactionId() - , StatsRequestType.ALL_METER);; - - } - - public void sendMeterConfigStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ - - GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder(); - - input.setNode(targetNode); - - Future> response = - meterStatsService.getAllMeterConfigStatistics(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(getNodeId(targetNode), response.get().getResult().getTransactionId() - , StatsRequestType.METER_CONFIG);; - - } - - private void sendAllQueueStatsFromAllNodeConnector(NodeStatisticsHandler h) throws InterruptedException, ExecutionException { - GetAllQueuesStatisticsFromAllPortsInputBuilder input = new GetAllQueuesStatisticsFromAllPortsInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - - Future> response = - queueStatsService.getAllQueuesStatisticsFromAllPorts(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(), response.get().getResult().getTransactionId() - , StatsRequestType.ALL_QUEUE_STATS);; - - } - - public void sendQueueStatsFromGivenNodeConnector(NodeRef targetNode,NodeConnectorId nodeConnectorId, QueueId queueId) throws InterruptedException, ExecutionException { - GetQueueStatisticsFromGivenPortInputBuilder input = new GetQueueStatisticsFromGivenPortInputBuilder(); - - input.setNode(targetNode); - input.setNodeConnectorId(nodeConnectorId); - input.setQueueId(queueId); - Future> response = - queueStatsService.getQueueStatisticsFromGivenPort(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(getNodeId(targetNode), response.get().getResult().getTransactionId() - , StatsRequestType.ALL_QUEUE_STATS);; - - } - /** * Get the handler for a particular node. * @@ -429,13 +119,6 @@ public class StatisticsProvider implements AutoCloseable { return handler; } - @SuppressWarnings("unchecked") - private NodeId getNodeId(NodeRef nodeRef){ - InstanceIdentifier nodeII = (InstanceIdentifier) nodeRef.getValue(); - NodeKey nodeKey = InstanceIdentifier.keyOf(nodeII); - return nodeKey.getId(); - } - @Override public void close() { try { @@ -462,13 +145,13 @@ public class StatisticsProvider implements AutoCloseable { continue; } - final NodeStatisticsHandler h = new NodeStatisticsHandler(dps, key); + final NodeStatisticsHandler h = new NodeStatisticsHandler(dps, key, + flowStatsService, flowTableStatsService, groupStatsService, + meterStatsService, portStatsService, queueStatsService,srScheduler); final NodeStatisticsHandler old = handlers.putIfAbsent(key.getId(), h); if (old == null) { spLogger.debug("Started node handler for {}", key.getId()); - - // FIXME: this should be in the NodeStatisticsHandler itself - sendStatisticsRequestsToNode(h); + h.start(timer); } else { spLogger.debug("Prevented race on handler for {}", key.getId()); }