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%2FNodeStatisticsHandler.java;h=5d5d17230fda1d9efa458deddc3d5fbb44626c86;hp=45788b331954ceaad947977d8cc61ec9e4e4f25d;hb=c02e660d9121e93f35f99c773c1ba1a0a40513f7;hpb=6fa3aa30c3eb47ca13520f9b4090bd03bf4e191f diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/NodeStatisticsHandler.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/NodeStatisticsHandler.java index 45788b3319..5d5d17230f 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/NodeStatisticsHandler.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/NodeStatisticsHandler.java @@ -9,6 +9,8 @@ package org.opendaylight.controller.md.statistics.manager; import java.util.Collection; import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.opendaylight.controller.md.statistics.manager.MultipartMessageManager.StatsRequestType; @@ -18,34 +20,66 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl 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.TableBuilder; 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.AggregateFlowStatisticsData; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.AggregateFlowStatisticsDataBuilder; +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.statistics.rev130819.aggregate.flow.statistics.AggregateFlowStatisticsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.flow.and.statistics.map.list.FlowAndStatisticsMapList; +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.table.statistics.rev131215.flow.table.and.statistics.map.FlowTableAndStatisticsMap; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionAware; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId; +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.NodeGroupFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.NodeGroupFeaturesBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.OpendaylightGroupStatisticsService; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.group.features.GroupFeaturesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.statistics.reply.GroupStats; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; 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.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; 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.NodeMeterFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.NodeMeterFeaturesBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.OpendaylightMeterStatisticsService; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.MeterFeaturesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.config.stats.reply.MeterConfigStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.AggregateFlowStatistics; +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.port.statistics.rev131214.node.connector.statistics.and.port.number.map.NodeConnectorStatisticsAndPortNumberMap; +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.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.queue.id.and.statistics.map.QueueIdAndStatisticsMap; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,6 +96,13 @@ public final class NodeStatisticsHandler implements AutoCloseable { private static final Logger logger = LoggerFactory.getLogger(NodeStatisticsHandler.class); private static final int NUMBER_OF_WAIT_CYCLES = 2; + private final OpendaylightFlowStatisticsService flowStatsService; + private final OpendaylightFlowTableStatisticsService flowTableStatsService; + private final OpendaylightGroupStatisticsService groupStatsService; + private final OpendaylightMeterStatisticsService meterStatsService; + private final OpendaylightPortStatisticsService portStatsService; + private final OpendaylightQueueStatisticsService queueStatsService; + private final MultipartMessageManager msgManager = new MultipartMessageManager(); private final InstanceIdentifier targetNodeIdentifier; private final FlowStatsTracker flowStats; @@ -76,12 +117,25 @@ public final class NodeStatisticsHandler implements AutoCloseable { private final NodeRef targetNodeRef; private final NodeKey targetNodeKey; - public NodeStatisticsHandler(final DataProviderService dps, final NodeKey nodeKey) { + public NodeStatisticsHandler(final DataProviderService dps, final NodeKey nodeKey, + final OpendaylightFlowStatisticsService flowStatsService, + final OpendaylightFlowTableStatisticsService flowTableStatsService, + final OpendaylightGroupStatisticsService groupStatsService, + final OpendaylightMeterStatisticsService meterStatsService, + final OpendaylightPortStatisticsService portStatsService, + final OpendaylightQueueStatisticsService queueStatsService) { this.dps = Preconditions.checkNotNull(dps); this.targetNodeKey = Preconditions.checkNotNull(nodeKey); this.targetNodeIdentifier = InstanceIdentifier.builder(Nodes.class).child(Node.class, targetNodeKey).build(); this.targetNodeRef = new NodeRef(targetNodeIdentifier); + this.flowStatsService = flowStatsService; + this.flowTableStatsService = flowTableStatsService; + this.groupStatsService = groupStatsService; + this.meterStatsService = meterStatsService; + this.portStatsService = portStatsService; + this.queueStatsService = queueStatsService; + final long lifetimeNanos = TimeUnit.MILLISECONDS.toNanos(StatisticsProvider.STATS_COLLECTION_MILLIS * NUMBER_OF_WAIT_CYCLES); flowStats = new FlowStatsTracker(targetNodeIdentifier, dps, lifetimeNanos); flowTableStats = new FlowTableStatsTracker(targetNodeIdentifier, dps, lifetimeNanos); @@ -233,19 +287,179 @@ public final class NodeStatisticsHandler implements AutoCloseable { trans.commit(); } + public synchronized void requestPeriodicStatistics() { + logger.debug("Send requests for statistics collection to node : {}", targetNodeKey); + + try{ + if(flowTableStatsService != null){ + final GetFlowTablesStatisticsInputBuilder input = new GetFlowTablesStatisticsInputBuilder(); + input.setNode(targetNodeRef); + + Future> response = flowTableStatsService.getFlowTablesStatistics(input.build()); + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.ALL_FLOW_TABLE); + } + if(flowStatsService != null){ + // FIXME: it does not make sense to trigger this before sendAllFlowTablesStatisticsRequest() + // comes back -- we do not have any tables anyway. + sendAggregateFlowsStatsFromAllTablesRequest(); + + sendAllFlowsStatsFromAllTablesRequest(); + } + if(portStatsService != null){ + sendAllNodeConnectorsStatisticsRequest(); + } + if(groupStatsService != null){ + sendAllGroupStatisticsRequest(); + sendGroupDescriptionRequest(); + } + if(meterStatsService != null){ + sendAllMeterStatisticsRequest(); + sendMeterConfigStatisticsRequest(); + } + if(queueStatsService != null){ + sendAllQueueStatsFromAllNodeConnector(); + } + } catch(Exception e) { + logger.error("Exception occured while sending statistics requests", e); + } + } + + public synchronized void start() { + requestPeriodicStatistics(); + } + @Override - public void close() { + public synchronized void close() { // FIXME: cleanup any resources we hold (registrations, etc.) logger.debug("Statistics handler for {} shut down", targetNodeKey.getId()); } - // FIXME: this should be private - public synchronized void recordExpectedTransaction(TransactionId transactionId, StatsRequestType reqType) { + synchronized void sendFlowStatsFromTableRequest(Flow flow) throws InterruptedException, ExecutionException{ + final GetFlowStatisticsFromFlowTableInputBuilder input = + new GetFlowStatisticsFromFlowTableInputBuilder(flow); + + input.setNode(targetNodeRef); + + Future> response = + flowStatsService.getFlowStatisticsFromFlowTable(input.build()); + + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.ALL_FLOW); + } + + synchronized void sendGroupDescriptionRequest() throws InterruptedException, ExecutionException{ + final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder(); + + input.setNode(targetNodeRef); + + Future> response = + groupStatsService.getGroupDescription(input.build()); + + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.GROUP_DESC); + } + + synchronized void sendMeterConfigStatisticsRequest() throws InterruptedException, ExecutionException{ + + GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder(); + + input.setNode(targetNodeRef); + + Future> response = + meterStatsService.getAllMeterConfigStatistics(input.build()); + + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.METER_CONFIG); + } + + synchronized void sendQueueStatsFromGivenNodeConnector(NodeConnectorId nodeConnectorId, QueueId queueId) throws InterruptedException, ExecutionException { + GetQueueStatisticsFromGivenPortInputBuilder input = new GetQueueStatisticsFromGivenPortInputBuilder(); + + input.setNode(targetNodeRef); + input.setNodeConnectorId(nodeConnectorId); + input.setQueueId(queueId); + Future> response = + queueStatsService.getQueueStatisticsFromGivenPort(input.build()); + + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.ALL_QUEUE_STATS);; + } + + private void sendAllMeterStatisticsRequest() throws InterruptedException, ExecutionException{ + + GetAllMeterStatisticsInputBuilder input = new GetAllMeterStatisticsInputBuilder(); + + input.setNode(targetNodeRef); + + Future> response = + meterStatsService.getAllMeterStatistics(input.build()); + + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.ALL_METER); + } + + private void sendAllFlowsStatsFromAllTablesRequest() throws InterruptedException, ExecutionException{ + final GetAllFlowsStatisticsFromAllFlowTablesInputBuilder input = new GetAllFlowsStatisticsFromAllFlowTablesInputBuilder(); + input.setNode(targetNodeRef); + + Future> response = flowStatsService.getAllFlowsStatisticsFromAllFlowTables(input.build()); + + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.ALL_FLOW); + } + + private void sendAggregateFlowsStatsFromAllTablesRequest() throws InterruptedException, ExecutionException{ + final Collection tables = getKnownTables(); + logger.debug("Node {} supports {} table(s)", targetNodeKey, tables.size()); + + for (TableKey key : tables) { + sendAggregateFlowsStatsFromTableRequest(key.getId().shortValue()); + } + } + + private void sendAggregateFlowsStatsFromTableRequest(Short tableId) throws InterruptedException, ExecutionException{ + logger.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()); + + recordExpectedTableTransaction(response.get().getResult().getTransactionId(), tableId); + } + + private void sendAllQueueStatsFromAllNodeConnector() throws InterruptedException, ExecutionException { + GetAllQueuesStatisticsFromAllPortsInputBuilder input = new GetAllQueuesStatisticsFromAllPortsInputBuilder(); + + input.setNode(targetNodeRef); + + Future> response = + queueStatsService.getAllQueuesStatisticsFromAllPorts(input.build()); + + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.ALL_QUEUE_STATS); + } + + private void sendAllNodeConnectorsStatisticsRequest() throws InterruptedException, ExecutionException{ + final GetAllNodeConnectorsStatisticsInputBuilder input = new GetAllNodeConnectorsStatisticsInputBuilder(); + + input.setNode(targetNodeRef); + + Future> response = + portStatsService.getAllNodeConnectorsStatistics(input.build()); + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.ALL_PORT); + } + + private void sendAllGroupStatisticsRequest() throws InterruptedException, ExecutionException{ + final GetAllGroupStatisticsInputBuilder input = new GetAllGroupStatisticsInputBuilder(); + input.setNode(targetNodeRef); + + Future> response = + groupStatsService.getAllGroupStatistics(input.build()); + + recordExpectedTransaction(response.get().getResult().getTransactionId(), StatsRequestType.ALL_GROUP); + } + + private void recordExpectedTransaction(TransactionId transactionId, StatsRequestType reqType) { msgManager.recordExpectedTransaction(transactionId, reqType); } - // FIXME: this should be private - public synchronized void recordExpectedTableTransaction(TransactionId transactionId, Short tableId) { + private void recordExpectedTableTransaction(TransactionId transactionId, Short tableId) { msgManager.recordExpectedTableTransaction(transactionId, StatsRequestType.AGGR_FLOW, tableId); } }