X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FStatisticsProvider.java;h=9ab1e9c5d1a453a4fc24746a96d2862e5db620a9;hb=c02e660d9121e93f35f99c773c1ba1a0a40513f7;hp=d8ee80a10f4f6f3895bbd1c150022cffa852ad8b;hpb=8c15887914175912fe9322ef365d1998f3cf5108;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 d8ee80a10f..9ab1e9c5d1 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 @@ -13,10 +13,8 @@ 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; @@ -27,52 +25,27 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl 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; @@ -96,7 +69,6 @@ public class StatisticsProvider implements AutoCloseable { 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; @@ -118,10 +90,6 @@ public class StatisticsProvider implements AutoCloseable { this.dps = Preconditions.checkNotNull(dataService); } - public MultipartMessageManager getMultipartMessageManager() { - return multipartMessageManager; - } - private final StatisticsListener updateCommiter = new StatisticsListener(StatisticsProvider.this); private Registration listenerRegistration; @@ -156,14 +124,15 @@ public class StatisticsProvider implements AutoCloseable { public void run() { try { // Send stats requests - statsRequestSender(); + for (NodeStatisticsHandler h : handlers.values()) { + h.requestPeriodicStatistics(); + } // Perform cleanup for(NodeStatisticsHandler nodeStatisticsAger : handlers.values()){ nodeStatisticsAger.cleanStaleStatistics(); } - multipartMessageManager.cleanStaleTransactionIds(); } catch (RuntimeException e) { spLogger.warn("Failed to request statistics", e); } @@ -209,233 +178,34 @@ public class StatisticsProvider implements AutoCloseable { 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); - } - if(meterStatsService != null){ - sendAllMeterStatisticsRequest(h); - sendMeterConfigStatisticsRequest(h); - } - 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(NodeKey node, Flow flow) throws InterruptedException, ExecutionException { final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); if (h != null) { - sendFlowStatsFromTableRequest(h, flow); + h.sendFlowStatsFromTableRequest(flow); } } - private void sendFlowStatsFromTableRequest(NodeStatisticsHandler h, Flow flow) throws InterruptedException, ExecutionException{ - final GetFlowStatisticsFromFlowTableInputBuilder input = - new GetFlowStatisticsFromFlowTableInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - input.fieldsFrom(flow); - - Future> response = - flowStatsService.getFlowStatisticsFromFlowTable(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(), - 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(NodeKey node) throws InterruptedException, ExecutionException{ final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); if (h != null) { - sendGroupDescriptionRequest(h); + h.sendGroupDescriptionRequest(); } } - private void sendGroupDescriptionRequest(NodeStatisticsHandler h) throws InterruptedException, ExecutionException{ - final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - - Future> response = - groupStatsService.getGroupDescription(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(), - 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(NodeKey node) throws InterruptedException, ExecutionException { final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); if (h != null) { - sendMeterConfigStatisticsRequest(h); + h.sendMeterConfigStatisticsRequest(); } } - private void sendMeterConfigStatisticsRequest(NodeStatisticsHandler h) throws InterruptedException, ExecutionException{ - - GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - - Future> response = - meterStatsService.getAllMeterConfigStatistics(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(), - 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(NodeKey node,NodeConnectorId nodeConnectorId, QueueId queueId) throws InterruptedException, ExecutionException { final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); if (h != null) { - sendQueueStatsFromGivenNodeConnector(h, nodeConnectorId, queueId); + h.sendQueueStatsFromGivenNodeConnector(nodeConnectorId, queueId); } } - private void sendQueueStatsFromGivenNodeConnector(NodeStatisticsHandler h, NodeConnectorId nodeConnectorId, QueueId queueId) throws InterruptedException, ExecutionException { - GetQueueStatisticsFromGivenPortInputBuilder input = new GetQueueStatisticsFromGivenPortInputBuilder(); - - input.setNode(h.getTargetNodeRef()); - input.setNodeConnectorId(nodeConnectorId); - input.setQueueId(queueId); - Future> response = - queueStatsService.getQueueStatisticsFromGivenPort(input.build()); - - this.multipartMessageManager.addTxIdToRequestTypeEntry(h.getTargetNodeKey().getId(), - response.get().getResult().getTransactionId(), StatsRequestType.ALL_QUEUE_STATS);; - } - /** * Get the handler for a particular node. * @@ -478,13 +248,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); 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(); } else { spLogger.debug("Prevented race on handler for {}", key.getId()); }