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=061e633e089b100d1fe5c4a9d5d8c6f296f426cd;hp=d1ab3515035dfb0b5597c263c5f23ac29656d659;hb=c0497aa3c01474dd6c65a2b4f149feffc12ed90b;hpb=cf9cefeac29c7ddc26e99a604e6a479e8ae0e68e 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 d1ab351503..061e633e08 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 @@ -7,31 +7,39 @@ */ package org.opendaylight.controller.md.statistics.manager; +import java.util.ArrayList; 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.sal.binding.api.NotificationProviderService; 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.tables.Table; +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.OpendaylightFlowStatisticsService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.TableId; 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.GetGroupFeaturesInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupFeaturesOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.OpendaylightGroupStatisticsService; 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.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.GetMeterFeaturesInputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.GetMeterFeaturesOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.OpendaylightMeterStatisticsService; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; @@ -52,10 +60,15 @@ public class StatisticsProvider implements AutoCloseable { private OpendaylightMeterStatisticsService meterStatsService; + private OpendaylightFlowStatisticsService flowStatsService; + + private final MultipartMessageManager multipartMessageManager = new MultipartMessageManager(); + private Thread statisticsRequesterThread; - private final InstanceIdentifier nodesIdentifier = InstanceIdentifier.builder().node(Nodes.class).toInstance(); + 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 = @@ -77,6 +90,10 @@ public class StatisticsProvider implements AutoCloseable { this.nps = notificationService; } + public MultipartMessageManager getMultipartMessageManager() { + return multipartMessageManager; + } + private final StatisticsUpdateCommiter updateCommiter = new StatisticsUpdateCommiter(StatisticsProvider.this); private Registration listenerRegistration; @@ -93,6 +110,9 @@ public class StatisticsProvider implements AutoCloseable { meterStatsService = StatisticsManagerActivator.getProviderContext(). getRpcService(OpendaylightMeterStatisticsService.class); + + flowStatsService = StatisticsManagerActivator.getProviderContext(). + getRpcService(OpendaylightFlowStatisticsService.class); statisticsRequesterThread = new Thread( new Runnable(){ @@ -102,7 +122,7 @@ public class StatisticsProvider implements AutoCloseable { try { statsRequestSender(); - Thread.sleep(5000); + Thread.sleep(STATS_THREAD_EXECUTION_TIME); }catch (Exception e){ spLogger.error("Exception occurred while sending stats request : {}",e); } @@ -110,7 +130,7 @@ public class StatisticsProvider implements AutoCloseable { } }); - spLogger.debug("Statistics requester thread started with timer interval : {}",5000); + spLogger.debug("Statistics requester thread started with timer interval : {}",STATS_THREAD_EXECUTION_TIME); statisticsRequesterThread.start(); @@ -132,84 +152,130 @@ public class StatisticsProvider implements AutoCloseable { return; for (Node targetNode : targetNodes){ - spLogger.info("Send request for stats collection to node : {})",targetNode.getId()); - //We need to add check, so see if groups/meters are supported - //by the target node. Below check doesn't look good. - if(targetNode.getId().getValue().contains("openflow:")){ - sendAllGroupStatisticsRequest(targetNode); + InstanceIdentifier targetInstanceId = InstanceIdentifier.builder(Nodes.class).child(Node.class,targetNode.getKey()).toInstance(); + NodeRef targetNodeRef = new NodeRef(targetInstanceId); + + try { - sendAllMeterStatisticsRequest(targetNode); + 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()); - sendGroupDescriptionRequest(targetNode); + try{ + sendAllGroupStatisticsRequest(targetNodeRef); + Thread.sleep(1000); + sendAllMeterStatisticsRequest(targetNodeRef); + Thread.sleep(1000); + sendGroupDescriptionRequest(targetNodeRef); + Thread.sleep(1000); + sendMeterConfigStatisticsRequest(targetNodeRef); + Thread.sleep(1000); + }catch(Exception e){ + spLogger.error("Exception occured while sending statistics request : {}", e); + } + } + } + } + + private void sendAllFlowsStatsFromAllTablesRequest(NodeRef targetNode){ + final GetAllFlowsStatisticsFromAllFlowTablesInputBuilder input = + new GetAllFlowsStatisticsFromAllFlowTablesInputBuilder(); + + input.setNode(targetNode); + + @SuppressWarnings("unused") + Future> response = + flowStatsService.getAllFlowsStatisticsFromAllFlowTables(input.build()); + + } + + private void sendAggregateFlowsStatsFromAllTablesRequest(NodeKey targetNodeKey) throws InterruptedException, ExecutionException{ + + List tablesId = getTablesFromNode(targetNodeKey); + + if(tablesId.size() != 0){ + for(Short id : tablesId){ - sendGroupFeaturesRequest(targetNode); + spLogger.info("Send aggregate stats request for flow table {} to node {}",id,targetNodeKey); + GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder input = + new GetAggregateFlowStatisticsFromFlowTableForAllFlowsInputBuilder(); - sendMeterConfigStatisticsRequest(targetNode); + input.setNode(new NodeRef(InstanceIdentifier.builder(Nodes.class).child(Node.class, targetNodeKey).toInstance())); + input.setTableId(new TableId(id)); + Future> response = + flowStatsService.getAggregateFlowStatisticsFromFlowTableForAllFlows(input.build()); - sendMeterFeaturesRequest(targetNode); + multipartMessageManager.setTxIdAndTableIdMapEntry(response.get().getResult().getTransactionId(), id); } } + + //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(Node targetNode){ + + private void sendAllGroupStatisticsRequest(NodeRef targetNode){ final GetAllGroupStatisticsInputBuilder input = new GetAllGroupStatisticsInputBuilder(); - input.setId(targetNode.getId()); + input.setNode(targetNode); + @SuppressWarnings("unused") Future> response = groupStatsService.getAllGroupStatistics(input.build()); } - private void sendGroupDescriptionRequest(Node targetNode){ + private void sendGroupDescriptionRequest(NodeRef targetNode){ final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder(); - input.setId(targetNode.getId()); - + input.setNode(targetNode); + + @SuppressWarnings("unused") Future> response = groupStatsService.getGroupDescription(input.build()); } - private void sendGroupFeaturesRequest(Node targetNode){ - - GetGroupFeaturesInputBuilder input = new GetGroupFeaturesInputBuilder(); - - input.setId(targetNode.getId()); - - Future> response = - groupStatsService.getGroupFeatures(input.build()); - } - - private void sendAllMeterStatisticsRequest(Node targetNode){ + private void sendAllMeterStatisticsRequest(NodeRef targetNode){ GetAllMeterStatisticsInputBuilder input = new GetAllMeterStatisticsInputBuilder(); - input.setId(targetNode.getId()); - + input.setNode(targetNode); + + @SuppressWarnings("unused") Future> response = meterStatsService.getAllMeterStatistics(input.build()); } - private void sendMeterConfigStatisticsRequest(Node targetNode){ + private void sendMeterConfigStatisticsRequest(NodeRef targetNode){ GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder(); - input.setId(targetNode.getId()); - + input.setNode(targetNode); + + @SuppressWarnings("unused") Future> response = meterStatsService.getAllMeterConfigStatistics(input.build()); } - private void sendMeterFeaturesRequest(Node targetNode){ - - GetMeterFeaturesInputBuilder input = new GetMeterFeaturesInputBuilder(); - - input.setId(targetNode.getId()); - - Future> response = - meterStatsService.getMeterFeatures(input.build()); - } public ConcurrentMap getStatisticsCache() { return statisticsCache; @@ -224,6 +290,20 @@ public class StatisticsProvider implements AutoCloseable { spLogger.info("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); + List tablesId = new ArrayList(); + if(node != null && node.getTable()!=null){ + spLogger.info("Number of tables {} supported by node {}",node.getTable().size(),nodeKey); + for(Table table: node.getTable()){ + tablesId.add(table.getId()); + } + } + return tablesId; + } @SuppressWarnings("deprecation") @Override @@ -241,7 +321,6 @@ public class StatisticsProvider implements AutoCloseable { } catch (Throwable e) { throw Exceptions.sneakyThrow(e); } - } }