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=4eaad427381cac032d6e6b48de81d2da0f5e3445;hp=061e633e089b100d1fe5c4a9d5d8c6f296f426cd;hb=dad78e1fc8a7c67fa4b88cf09d6a952443462feb;hpb=2da26725be793b315794e751ecca009c7691008c 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 061e633e08..4eaad42738 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 @@ -15,6 +15,7 @@ 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.data.DataModificationTransaction; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; @@ -25,7 +26,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.G 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.OpendaylightFlowStatisticsService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.TableId; +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.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; @@ -41,6 +44,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111. 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.OpendaylightQueueStatisticsService; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.NotificationListener; @@ -51,41 +60,47 @@ import org.slf4j.LoggerFactory; public class StatisticsProvider implements AutoCloseable { public final static Logger spLogger = LoggerFactory.getLogger(StatisticsProvider.class); - + private DataProviderService dps; private NotificationProviderService nps; - + private OpendaylightGroupStatisticsService groupStatsService; - + private OpendaylightMeterStatisticsService meterStatsService; - + private OpendaylightFlowStatisticsService flowStatsService; - + + private OpendaylightPortStatisticsService portStatsService; + + private OpendaylightFlowTableStatisticsService flowTableStatsService; + + private OpendaylightQueueStatisticsService queueStatsService; + private final MultipartMessageManager multipartMessageManager = new MultipartMessageManager(); - + private Thread statisticsRequesterThread; - + private final InstanceIdentifier nodesIdentifier = InstanceIdentifier.builder(Nodes.class).toInstance(); - + private final int STATS_THREAD_EXECUTION_TIME= 50000; //Local caching of stats - - private final ConcurrentMap statisticsCache = + + private final ConcurrentMap statisticsCache = new ConcurrentHashMap(); - + public DataProviderService getDataService() { return this.dps; } - + public void setDataService(final DataProviderService dataService) { this.dps = dataService; } - + public NotificationProviderService getNotificationService() { return this.nps; } - + public void setNotificationService(final NotificationProviderService notificationService) { this.nps = notificationService; } @@ -95,25 +110,34 @@ public class StatisticsProvider implements AutoCloseable { } private final StatisticsUpdateCommiter updateCommiter = new StatisticsUpdateCommiter(StatisticsProvider.this); - + private Registration listenerRegistration; - + public void start() { - + NotificationProviderService nps = this.getNotificationService(); Registration registerNotificationListener = nps.registerNotificationListener(this.updateCommiter); this.listenerRegistration = registerNotificationListener; - + // Get Group/Meter statistics service instance groupStatsService = StatisticsManagerActivator.getProviderContext(). getRpcService(OpendaylightGroupStatisticsService.class); - + meterStatsService = StatisticsManagerActivator.getProviderContext(). getRpcService(OpendaylightMeterStatisticsService.class); - + flowStatsService = StatisticsManagerActivator.getProviderContext(). getRpcService(OpendaylightFlowStatisticsService.class); + portStatsService = StatisticsManagerActivator.getProviderContext(). + getRpcService(OpendaylightPortStatisticsService.class); + + flowTableStatsService = StatisticsManagerActivator.getProviderContext(). + getRpcService(OpendaylightFlowTableStatisticsService.class); + + queueStatsService = StatisticsManagerActivator.getProviderContext(). + getRpcService(OpendaylightQueueStatisticsService.class); + statisticsRequesterThread = new Thread( new Runnable(){ @Override @@ -121,7 +145,7 @@ public class StatisticsProvider implements AutoCloseable { while(true){ try { statsRequestSender(); - + Thread.sleep(STATS_THREAD_EXECUTION_TIME); }catch (Exception e){ spLogger.error("Exception occurred while sending stats request : {}",e); @@ -129,175 +153,218 @@ public class StatisticsProvider implements AutoCloseable { } } }); - + spLogger.debug("Statistics requester thread started with timer interval : {}",STATS_THREAD_EXECUTION_TIME); - + statisticsRequesterThread.start(); - + spLogger.info("Statistics Provider started."); } - + protected DataModificationTransaction startChange() { - + DataProviderService dps = this.getDataService(); return dps.beginTransaction(); } - + private void statsRequestSender(){ - - //Need to call API to receive all the nodes connected to controller. + List targetNodes = getAllConnectedNodes(); - + if(targetNodes == null) return; + for (Node targetNode : targetNodes){ - - InstanceIdentifier targetInstanceId = InstanceIdentifier.builder(Nodes.class).child(Node.class,targetNode.getKey()).toInstance(); - NodeRef targetNodeRef = new NodeRef(targetInstanceId); - - try { - - sendAggregateFlowsStatsFromAllTablesRequest(targetNode.getKey()); - - sendAllFlowsStatsFromAllTablesRequest(targetNodeRef); - - }catch(Exception e){ - spLogger.error("Exception occured while sending flow statistics request : {}",e); - } if(targetNode.getAugmentation(FlowCapableNode.class) != null){ - spLogger.info("Send request for stats collection to node : {})",targetNode.getId()); - + spLogger.trace("Send request for stats collection to node : {})",targetNode.getId()); + + InstanceIdentifier targetInstanceId = InstanceIdentifier.builder(Nodes.class).child(Node.class,targetNode.getKey()).toInstance(); + + NodeRef targetNodeRef = new NodeRef(targetInstanceId); + try{ - sendAllGroupStatisticsRequest(targetNodeRef); - Thread.sleep(1000); - sendAllMeterStatisticsRequest(targetNodeRef); - Thread.sleep(1000); - sendGroupDescriptionRequest(targetNodeRef); - Thread.sleep(1000); - sendMeterConfigStatisticsRequest(targetNodeRef); - Thread.sleep(1000); + sendAggregateFlowsStatsFromAllTablesRequest(targetNode.getKey()); + + sendAllFlowsStatsFromAllTablesRequest(targetNodeRef); + + sendAllNodeConnectorsStatisticsRequest(targetNodeRef); + + sendAllFlowTablesStatisticsRequest(targetNodeRef); + + sendAllQueueStatsFromAllNodeConnector (targetNodeRef); + + sendAllGroupStatisticsRequest(targetNodeRef); + + sendAllMeterStatisticsRequest(targetNodeRef); + + sendGroupDescriptionRequest(targetNodeRef); + + sendMeterConfigStatisticsRequest(targetNodeRef); }catch(Exception e){ - spLogger.error("Exception occured while sending statistics request : {}", e); + spLogger.error("Exception occured while sending statistics requests : {}", e); } } } } - - private void sendAllFlowsStatsFromAllTablesRequest(NodeRef targetNode){ + + private void sendAllFlowTablesStatisticsRequest(NodeRef targetNodeRef) throws InterruptedException, ExecutionException { + final GetFlowTablesStatisticsInputBuilder input = + new GetFlowTablesStatisticsInputBuilder(); + + input.setNode(targetNodeRef); + + Future> response = + flowTableStatsService.getFlowTablesStatistics(input.build()); + + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() + , StatsRequestType.ALL_FLOW_TABLE); + + } + + private void sendAllFlowsStatsFromAllTablesRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ final GetAllFlowsStatisticsFromAllFlowTablesInputBuilder input = new GetAllFlowsStatisticsFromAllFlowTablesInputBuilder(); - + input.setNode(targetNode); - - @SuppressWarnings("unused") - Future> response = + + Future> response = flowStatsService.getAllFlowsStatisticsFromAllFlowTables(input.build()); - + + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() + , StatsRequestType.ALL_FLOW); + } - + private void sendAggregateFlowsStatsFromAllTablesRequest(NodeKey targetNodeKey) throws InterruptedException, ExecutionException{ - + List tablesId = getTablesFromNode(targetNodeKey); - + if(tablesId.size() != 0){ for(Short id : tablesId){ - - spLogger.info("Send aggregate stats request for flow table {} to node {}",id,targetNodeKey); - GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder input = + + spLogger.trace("Send aggregate stats request for flow table {} to node {}",id,targetNodeKey); + GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder input = new GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder(); - + input.setNode(new NodeRef(InstanceIdentifier.builder(Nodes.class).child(Node.class, targetNodeKey).toInstance())); - input.setTableId(new TableId(id)); - Future> response = + input.setTableId(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId(id)); + Future> response = flowStatsService.getAggregateFlowStatisticsFromFlowTableForAllFlows(input.build()); - + multipartMessageManager.setTxIdAndTableIdMapEntry(response.get().getResult().getTransactionId(), id); + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() + , StatsRequestType.AGGR_FLOW); } + }else{ + spLogger.debug("No details found in data store for flow tables associated with Node {}",targetNodeKey); } - - //Note: Just for testing, because i am not able to fetch table list from datastore - // Bug-225 is raised for investigation. - -// spLogger.info("Send aggregate stats request for flow table {} to node {}",1,targetNodeKey); -// GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder input = -// new GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder(); -// -// input.setNode(new NodeRef(InstanceIdentifier.builder(Nodes.class).child(Node.class, targetNodeKey).toInstance())); -// input.setTableId(new TableId((short)1)); -// Future> response = -// flowStatsService.getAggregateFlowStatisticsFromFlowTableForAllFlows(input.build());` -// -// multipartMessageManager.setTxIdAndTableIdMapEntry(response.get().getResult().getTransactionId(), (short)1); } - private void sendAllGroupStatisticsRequest(NodeRef targetNode){ - + private void sendAllNodeConnectorsStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ + + final GetAllNodeConnectorsStatisticsInputBuilder input = new GetAllNodeConnectorsStatisticsInputBuilder(); + + input.setNode(targetNode); + + Future> response = + portStatsService.getAllNodeConnectorsStatistics(input.build()); + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() + , StatsRequestType.ALL_PORT); + + } + + private void sendAllGroupStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ + final GetAllGroupStatisticsInputBuilder input = new GetAllGroupStatisticsInputBuilder(); - + input.setNode(targetNode); - @SuppressWarnings("unused") - Future> response = + Future> response = groupStatsService.getAllGroupStatistics(input.build()); + + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() + , StatsRequestType.ALL_GROUP); + } - - private void sendGroupDescriptionRequest(NodeRef targetNode){ + + private void sendGroupDescriptionRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder(); - + input.setNode(targetNode); - @SuppressWarnings("unused") - Future> response = + Future> response = groupStatsService.getGroupDescription(input.build()); + + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() + , StatsRequestType.GROUP_DESC); + } - - private void sendAllMeterStatisticsRequest(NodeRef targetNode){ - + + private void sendAllMeterStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ + GetAllMeterStatisticsInputBuilder input = new GetAllMeterStatisticsInputBuilder(); - + input.setNode(targetNode); - @SuppressWarnings("unused") - Future> response = + Future> response = meterStatsService.getAllMeterStatistics(input.build()); + + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() + , StatsRequestType.ALL_METER);; + } - - private void sendMeterConfigStatisticsRequest(NodeRef targetNode){ - + + private void sendMeterConfigStatisticsRequest(NodeRef targetNode) throws InterruptedException, ExecutionException{ + GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder(); - + input.setNode(targetNode); - @SuppressWarnings("unused") - Future> response = + Future> response = meterStatsService.getAllMeterConfigStatistics(input.build()); - + + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() + , StatsRequestType.METER_CONFIG);; + + } + + private void sendAllQueueStatsFromAllNodeConnector(NodeRef targetNode) throws InterruptedException, ExecutionException { + GetAllQueuesStatisticsFromAllPortsInputBuilder input = new GetAllQueuesStatisticsFromAllPortsInputBuilder(); + + input.setNode(targetNode); + + Future> response = + queueStatsService.getAllQueuesStatisticsFromAllPorts(input.build()); + + this.multipartMessageManager.addTxIdToRequestTypeEntry(response.get().getResult().getTransactionId() + , StatsRequestType.ALL_QUEUE_STATS);; + } - + public ConcurrentMap getStatisticsCache() { return statisticsCache; } - + private List getAllConnectedNodes(){ - + Nodes nodes = (Nodes) dps.readOperationalData(nodesIdentifier); if(nodes == null) return null; - - spLogger.info("Number of connected nodes : {}",nodes.getNode().size()); + + spLogger.trace("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.readConfigurationData(nodesIdentifier); + + FlowCapableNode node = (FlowCapableNode)dps.readOperationalData(nodesIdentifier); List tablesId = new ArrayList(); if(node != null && node.getTable()!=null){ - spLogger.info("Number of tables {} supported by node {}",node.getTable().size(),nodeKey); + spLogger.trace("Number of tables {} supported by node {}",node.getTable().size(),nodeKey); for(Table table: node.getTable()){ tablesId.add(table.getId()); } @@ -308,15 +375,15 @@ public class StatisticsProvider implements AutoCloseable { @SuppressWarnings("deprecation") @Override public void close(){ - + try { - spLogger.info("Statistics Provider stopped."); + spLogger.trace("Statistics Provider stopped."); if (this.listenerRegistration != null) { - + this.listenerRegistration.close(); - + this.statisticsRequesterThread.destroy(); - + } } catch (Throwable e) { throw Exceptions.sneakyThrow(e);