X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FStatisticsUpdateCommiter.java;h=ace547a03c9f5d17d28764b0ffe9a53a227e1612;hb=9390dd5bea2420cdbb1e4f6c2029091811c4df5a;hp=5743865d39539cbf8fb32404abf28c5b9194faa0;hpb=af3eaa839bf6f6c86495b24d2174eeb6624501c0;p=controller.git diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java index 5743865d39..ace547a03c 100644 --- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java +++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java @@ -7,10 +7,11 @@ */ package org.opendaylight.controller.md.statistics.manager; -import java.util.HashMap; import java.util.List; import java.util.concurrent.ConcurrentMap; +import org.opendaylight.controller.md.statistics.manager.NodeStatisticsAger.FlowEntry; +import org.opendaylight.controller.md.statistics.manager.NodeStatisticsAger.QueueEntry; import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector; @@ -44,7 +45,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.Queue; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.QueueBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.QueueKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.queue.rev130925.QueueId; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupDescStatsUpdated; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GroupFeaturesUpdated; @@ -88,7 +88,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatisticsBuilder; 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.GenericQueueStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.GenericStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData; import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsDataBuilder; @@ -108,68 +107,68 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Class implement statistics manager related listener interface and augment all the + * Class implement statistics manager related listener interface and augment all the * received statistics data to data stores. - * TODO: Need to add error message listener and clean-up the associated tx id + * TODO: Need to add error message listener and clean-up the associated tx id * if it exists in the tx-id cache. * @author vishnoianil * */ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsListener, - OpendaylightMeterStatisticsListener, + OpendaylightMeterStatisticsListener, OpendaylightFlowStatisticsListener, OpendaylightPortStatisticsListener, OpendaylightFlowTableStatisticsListener, OpendaylightQueueStatisticsListener{ - + public final static Logger sucLogger = LoggerFactory.getLogger(StatisticsUpdateCommiter.class); private final StatisticsProvider statisticsManager; - - private final int unaccountedFlowsCounter = 1; + + private int unaccountedFlowsCounter = 1; public StatisticsUpdateCommiter(final StatisticsProvider manager){ this.statisticsManager = manager; } - + public StatisticsProvider getStatisticsManager(){ return statisticsManager; } - + @Override public void onMeterConfigStatsUpdated(MeterConfigStatsUpdated notification) { //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; + + NodeKey key = new NodeKey(notification.getId()); //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); + cache.put(notification.getId(), new NodeStatisticsAger(statisticsManager,key)); } - cache.get(notification.getId()).setMeterConfigStats(notification.getMeterConfigStats()); - + cache.get(notification.getId()).updateMeterConfigStats(notification.getMeterConfigStats()); + //Publish data to configuration data store - NodeKey key = new NodeKey(notification.getId()); - - List eterConfigStatsList = notification.getMeterConfigStats(); - - for(MeterConfigStats meterConfigStats : eterConfigStatsList){ + List meterConfigStatsList = notification.getMeterConfigStats(); + + for(MeterConfigStats meterConfigStats : meterConfigStatsList){ DataModificationTransaction it = this.statisticsManager.startChange(); MeterBuilder meterBuilder = new MeterBuilder(); MeterKey meterKey = new MeterKey(meterConfigStats.getMeterId()); meterBuilder.setKey(meterKey); - + InstanceIdentifier meterRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) .augmentation(FlowCapableNode.class) .child(Meter.class,meterKey).toInstance(); - + NodeMeterConfigStatsBuilder meterConfig= new NodeMeterConfigStatsBuilder(); MeterConfigStatsBuilder stats = new MeterConfigStatsBuilder(); stats.fieldsFrom(meterConfigStats); meterConfig.setMeterConfigStats(stats.build()); - + //Update augmented data meterBuilder.addAugmentation(NodeMeterConfigStats.class, meterConfig.build()); it.putOperationalData(meterRef, meterBuilder.build()); @@ -180,22 +179,15 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onMeterStatisticsUpdated(MeterStatisticsUpdated notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - cache.get(notification.getId()).setMeterStatistics(notification.getMeterStats()); - NodeKey key = new NodeKey(notification.getId()); - + List meterStatsList = notification.getMeterStats(); - + for(MeterStats meterStats : meterStatsList){ //Publish data to configuration data store @@ -203,11 +195,11 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList MeterBuilder meterBuilder = new MeterBuilder(); MeterKey meterKey = new MeterKey(meterStats.getMeterId()); meterBuilder.setKey(meterKey); - + InstanceIdentifier meterRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) .augmentation(FlowCapableNode.class) .child(Meter.class,meterKey).toInstance(); - + NodeMeterStatisticsBuilder meterStatsBuilder= new NodeMeterStatisticsBuilder(); MeterStatisticsBuilder stats = new MeterStatisticsBuilder(); stats.fieldsFrom(meterStats); @@ -222,29 +214,30 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onGroupDescStatsUpdated(GroupDescStatsUpdated notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; + NodeKey key = new NodeKey(notification.getId()); + //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); + cache.put(notification.getId(), new NodeStatisticsAger(statisticsManager,key)); } - cache.get(notification.getId()).setGroupDescStats(notification.getGroupDescStats()); - + cache.get(notification.getId()).updateGroupDescStats(notification.getGroupDescStats()); + //Publish data to configuration data store - NodeKey key = new NodeKey(notification.getId()); List groupDescStatsList = notification.getGroupDescStats(); for(GroupDescStats groupDescStats : groupDescStatsList){ DataModificationTransaction it = this.statisticsManager.startChange(); - + GroupBuilder groupBuilder = new GroupBuilder(); GroupKey groupKey = new GroupKey(groupDescStats.getGroupId()); groupBuilder.setKey(groupKey); - + InstanceIdentifier groupRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) .augmentation(FlowCapableNode.class) .child(Group.class,groupKey).toInstance(); @@ -253,7 +246,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList GroupDescBuilder stats = new GroupDescBuilder(); stats.fieldsFrom(groupDescStats); groupDesc.setGroupDesc(stats.build()); - + //Update augmented data groupBuilder.addAugmentation(NodeGroupDescStats.class, groupDesc.build()); @@ -264,29 +257,22 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onGroupStatisticsUpdated(GroupStatisticsUpdated notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - cache.get(notification.getId()).setGroupStatistics(notification.getGroupStats()); - //Publish data to configuration data store NodeKey key = new NodeKey(notification.getId()); List groupStatsList = notification.getGroupStats(); for(GroupStats groupStats : groupStatsList){ DataModificationTransaction it = this.statisticsManager.startChange(); - + GroupBuilder groupBuilder = new GroupBuilder(); GroupKey groupKey = new GroupKey(groupStats.getGroupId()); groupBuilder.setKey(groupKey); - + InstanceIdentifier groupRef = InstanceIdentifier.builder(Nodes.class).child(Node.class,key) .augmentation(FlowCapableNode.class) .child(Group.class,groupKey).toInstance(); @@ -295,80 +281,66 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList GroupStatisticsBuilder stats = new GroupStatisticsBuilder(); stats.fieldsFrom(groupStats); groupStatisticsBuilder.setGroupStatistics(stats.build()); - + //Update augmented data groupBuilder.addAugmentation(NodeGroupStatistics.class, groupStatisticsBuilder.build()); it.putOperationalData(groupRef, groupBuilder.build()); it.commit(); } } - + @Override public void onMeterFeaturesUpdated(MeterFeaturesUpdated notification) { - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } MeterFeaturesBuilder meterFeature = new MeterFeaturesBuilder(); meterFeature.setMeterBandSupported(notification.getMeterBandSupported()); meterFeature.setMeterCapabilitiesSupported(notification.getMeterCapabilitiesSupported()); meterFeature.setMaxBands(notification.getMaxBands()); meterFeature.setMaxColor(notification.getMaxColor()); meterFeature.setMaxMeter(notification.getMaxMeter()); - - cache.get(notification.getId()).setMeterFeatures(meterFeature.build()); - + //Publish data to configuration data store DataModificationTransaction it = this.statisticsManager.startChange(); NodeKey key = new NodeKey(notification.getId()); NodeRef ref = getNodeRef(key); - - final NodeBuilder nodeData = new NodeBuilder(); + + final NodeBuilder nodeData = new NodeBuilder(); nodeData.setKey(key); - + NodeMeterFeaturesBuilder nodeMeterFeatures= new NodeMeterFeaturesBuilder(); nodeMeterFeatures.setMeterFeatures(meterFeature.build()); - + //Update augmented data nodeData.addAugmentation(NodeMeterFeatures.class, nodeMeterFeatures.build()); - + InstanceIdentifier refValue = ref.getValue(); it.putOperationalData(refValue, nodeData.build()); it.commit(); } - + @Override public void onGroupFeaturesUpdated(GroupFeaturesUpdated notification) { - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - GroupFeaturesBuilder groupFeatures = new GroupFeaturesBuilder(); groupFeatures.setActions(notification.getActions()); groupFeatures.setGroupCapabilitiesSupported(notification.getGroupCapabilitiesSupported()); groupFeatures.setGroupTypesSupported(notification.getGroupTypesSupported()); groupFeatures.setMaxGroups(notification.getMaxGroups()); - cache.get(notification.getId()).setGroupFeatures(groupFeatures.build()); - + //Publish data to configuration data store DataModificationTransaction it = this.statisticsManager.startChange(); NodeKey key = new NodeKey(notification.getId()); NodeRef ref = getNodeRef(key); - - final NodeBuilder nodeData = new NodeBuilder(); + + final NodeBuilder nodeData = new NodeBuilder(); nodeData.setKey(key); - + NodeGroupFeaturesBuilder nodeGroupFeatures= new NodeGroupFeaturesBuilder(); nodeGroupFeatures.setGroupFeatures(groupFeatures.build()); - + //Update augmented data nodeData.addAugmentation(NodeGroupFeatures.class, nodeGroupFeatures.build()); - + InstanceIdentifier refValue = ref.getValue(); it.putOperationalData(refValue, nodeData.build()); it.commit(); @@ -376,17 +348,17 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onFlowsStatisticsUpdate(FlowsStatisticsUpdate notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received flow stats update : {}",notification.toString()); - + for(FlowAndStatisticsMapList map: notification.getFlowAndStatisticsMapList()){ short tableId = map.getTableId(); - + DataModificationTransaction it = this.statisticsManager.startChange(); boolean foundOriginalFlow = false; @@ -416,26 +388,25 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList flow.setPriority(map.getPriority()); flow.setStrict(map.isStrict()); flow.setTableId(tableId); - + Flow flowRule = flow.build(); - + FlowAndStatisticsMapListBuilder stats = new FlowAndStatisticsMapListBuilder(); stats.setByteCount(map.getByteCount()); stats.setPacketCount(map.getPacketCount()); stats.setDuration(map.getDuration()); - + GenericStatistics flowStats = stats.build(); - + //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); + cache.put(notification.getId(), new NodeStatisticsAger(statisticsManager,key)); } - if(!cache.get(notification.getId()).getFlowAndStatsMap().containsKey(tableId)){ - cache.get(notification.getId()).getFlowAndStatsMap().put(tableId, new HashMap()); - } - cache.get(notification.getId()).getFlowAndStatsMap().get(tableId).put(flowRule,flowStats); - + NodeStatisticsAger nsa = cache.get(notification.getId()); + FlowEntry flowStatsEntry = nsa.new FlowEntry(tableId,flowRule); + cache.get(notification.getId()).updateFlowStats(flowStatsEntry); + //Augment the data to the flow node FlowStatisticsBuilder flowStatistics = new FlowStatisticsBuilder(); @@ -460,17 +431,17 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList flowStatistics.setTableId(tableId); flowStatisticsData.setFlowStatistics(flowStatistics.build()); - + sucLogger.debug("Flow : {}",flowRule.toString()); sucLogger.debug("Statistics to augment : {}",flowStatistics.build().toString()); InstanceIdentifier tableRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(tableId)).toInstance(); - + Table table= (Table)it.readConfigurationData(tableRef); //TODO: Not a good way to do it, need to figure out better way. - //TODO: major issue in any alternate approach is that flow key is incrementally assigned + //TODO: major issue in any alternate approach is that flow key is incrementally assigned //to the flows stored in data store. if(table != null){ @@ -483,7 +454,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList .child(Flow.class,existingFlow.getKey()).toInstance(); flowBuilder.setKey(existingFlow.getKey()); flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); - sucLogger.trace("Found matching flow in the datastore, augmenting statistics"); + sucLogger.info("Found matching flow in the datastore, augmenting statistics"); foundOriginalFlow = true; it.putOperationalData(flowRef, flowBuilder.build()); it.commit(); @@ -491,11 +462,36 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } } } + + table= (Table)it.readOperationalData(tableRef); + if(!foundOriginalFlow && table != null){ + for(Flow existingFlow : table.getFlow()){ + FlowStatisticsData augmentedflowStatisticsData = existingFlow.getAugmentation(FlowStatisticsData.class); + if(augmentedflowStatisticsData != null){ + FlowBuilder existingOperationalFlow = new FlowBuilder(); + existingOperationalFlow.fieldsFrom(augmentedflowStatisticsData.getFlowStatistics()); + sucLogger.debug("Existing unaccounted flow in operational data store : {}",existingFlow.toString()); + if(flowEquals(flowRule,existingOperationalFlow.build())){ + InstanceIdentifier flowRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) + .augmentation(FlowCapableNode.class) + .child(Table.class, new TableKey(tableId)) + .child(Flow.class,existingFlow.getKey()).toInstance(); + flowBuilder.setKey(existingFlow.getKey()); + flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); + sucLogger.debug("Found matching flow in the operational datastore, augmenting statistics"); + foundOriginalFlow = true; + it.putOperationalData(flowRef, flowBuilder.build()); + it.commit(); + break; + } + } + } + } if(!foundOriginalFlow){ sucLogger.debug("Associated original flow is not found in data store. Augmenting flow in operational data store"); - //TODO: Temporary fix: format [ 1+tableid+1+unaccounted flow counter] - long flowKey = Long.parseLong(new String("1"+Short.toString(tableId)+"1"+Integer.toString(this.unaccountedFlowsCounter))); + long flowKey = Long.parseLong(new String("1"+Short.toString(tableId)+"0"+Integer.toString(this.unaccountedFlowsCounter))); + this.unaccountedFlowsCounter++; FlowKey newFlowKey = new FlowKey(new FlowId(Long.toString(flowKey))); InstanceIdentifier flowRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .augmentation(FlowCapableNode.class) @@ -503,7 +499,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList .child(Flow.class,newFlowKey).toInstance(); flowBuilder.setKey(newFlowKey); flowBuilder.addAugmentation(FlowStatisticsData.class, flowStatisticsData.build()); - sucLogger.trace("Flow was no present in data store, augmenting statistics as an unaccounted flow"); + sucLogger.info("Flow was no present in data store, augmenting statistics as an unaccounted flow"); it.putOperationalData(flowRef, flowBuilder.build()); it.commit(); } @@ -518,10 +514,10 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received aggregate flow statistics update : {}",notification.toString()); - + Short tableId = this.statisticsManager.getMultipartMessageManager().getTableIdForTxId(notification.getTransactionId()); if(tableId != null){ - + DataModificationTransaction it = this.statisticsManager.startChange(); InstanceIdentifier
tableRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) @@ -533,13 +529,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList aggregateFlowStatisticsBuilder.setFlowCount(notification.getFlowCount()); aggregateFlowStatisticsBuilder.setPacketCount(notification.getPacketCount()); aggregateFlowStatisticsDataBuilder.setAggregateFlowStatistics(aggregateFlowStatisticsBuilder.build()); - - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - cache.get(notification.getId()).getTableAndAggregateFlowStatsMap().put(tableId,aggregateFlowStatisticsBuilder.build()); - + sucLogger.debug("Augment aggregate statistics: {} for table {} on Node {}",aggregateFlowStatisticsBuilder.build().toString(),tableId,key); TableBuilder tableBuilder = new TableBuilder(); @@ -559,20 +549,13 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received port stats update : {}",notification.toString()); - - //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - - + List portsStats = notification.getNodeConnectorStatisticsAndPortNumberMap(); for(NodeConnectorStatisticsAndPortNumberMap portStats : portsStats){ - + DataModificationTransaction it = this.statisticsManager.startChange(); - FlowCapableNodeConnectorStatisticsBuilder statisticsBuilder + FlowCapableNodeConnectorStatisticsBuilder statisticsBuilder = new FlowCapableNodeConnectorStatisticsBuilder(); statisticsBuilder.setBytes(portStats.getBytes()); statisticsBuilder.setCollisionCount(portStats.getCollisionCount()); @@ -585,20 +568,17 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList statisticsBuilder.setReceiveOverRunError(portStats.getReceiveOverRunError()); statisticsBuilder.setTransmitDrops(portStats.getTransmitDrops()); statisticsBuilder.setTransmitErrors(portStats.getTransmitErrors()); - - //Update data in the cache - cache.get(notification.getId()).getNodeConnectorStats().put(portStats.getNodeConnectorId(), statisticsBuilder.build()); - + //Augment data to the node-connector - FlowCapableNodeConnectorStatisticsDataBuilder statisticsDataBuilder = + FlowCapableNodeConnectorStatisticsDataBuilder statisticsDataBuilder = new FlowCapableNodeConnectorStatisticsDataBuilder(); - + statisticsDataBuilder.setFlowCapableNodeConnectorStatistics(statisticsBuilder.build()); - + InstanceIdentifier nodeConnectorRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key).child(NodeConnector.class, new NodeConnectorKey(portStats.getNodeConnectorId())).toInstance(); - + NodeConnector nodeConnector = (NodeConnector)it.readOperationalData(nodeConnectorRef); - + if(nodeConnector != null){ sucLogger.debug("Augmenting port statistics {} to port {}",statisticsDataBuilder.build().toString(),nodeConnectorRef.toString()); NodeConnectorBuilder nodeConnectorBuilder = new NodeConnectorBuilder(); @@ -617,32 +597,26 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received flow table statistics update : {}",notification.toString()); - + List flowTablesStatsList = notification.getFlowTableAndStatisticsMap(); for (FlowTableAndStatisticsMap ftStats : flowTablesStatsList){ - + DataModificationTransaction it = this.statisticsManager.startChange(); InstanceIdentifier
tableRef = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .augmentation(FlowCapableNode.class).child(Table.class, new TableKey(ftStats.getTableId().getValue())).toInstance(); - + FlowTableStatisticsDataBuilder statisticsDataBuilder = new FlowTableStatisticsDataBuilder(); - + FlowTableStatisticsBuilder statisticsBuilder = new FlowTableStatisticsBuilder(); statisticsBuilder.setActiveFlows(ftStats.getActiveFlows()); statisticsBuilder.setPacketsLookedUp(ftStats.getPacketsLookedUp()); statisticsBuilder.setPacketsMatched(ftStats.getPacketsMatched()); - + statisticsDataBuilder.setFlowTableStatistics(statisticsBuilder.build()); - - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); - if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); - } - cache.get(notification.getId()).getFlowTableAndStatisticsMap().put(ftStats.getTableId().getValue(),statisticsBuilder.build()); - + sucLogger.debug("Augment flow table statistics: {} for table {} on Node {}",statisticsBuilder.build().toString(),ftStats.getTableId(),key); - + TableBuilder tableBuilder = new TableBuilder(); tableBuilder.setKey(new TableKey(ftStats.getTableId().getValue())); tableBuilder.addAugmentation(FlowTableStatisticsData.class, statisticsDataBuilder.build()); @@ -653,70 +627,66 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @Override public void onQueueStatisticsUpdate(QueueStatisticsUpdate notification) { - + //Check if response is for the request statistics-manager sent. if(this.statisticsManager.getMultipartMessageManager().removeTxId(notification.getTransactionId()) == null) return; NodeKey key = new NodeKey(notification.getId()); sucLogger.debug("Received queue stats update : {}",notification.toString()); - + //Add statistics to local cache - ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); + ConcurrentMap cache = this.statisticsManager.getStatisticsCache(); if(!cache.containsKey(notification.getId())){ - cache.put(notification.getId(), new NodeStatistics()); + cache.put(notification.getId(), new NodeStatisticsAger(statisticsManager,key)); } - + + NodeStatisticsAger nsa = cache.get(notification.getId()); + List queuesStats = notification.getQueueIdAndStatisticsMap(); for(QueueIdAndStatisticsMap swQueueStats : queuesStats){ - - if(!cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap().containsKey(swQueueStats.getNodeConnectorId())){ - cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap().put(swQueueStats.getNodeConnectorId(), new HashMap()); - } - + + QueueEntry queueEntry = nsa.new QueueEntry(swQueueStats.getNodeConnectorId(),swQueueStats.getQueueId()); + nsa.updateQueueStats(queueEntry); + FlowCapableNodeConnectorQueueStatisticsDataBuilder queueStatisticsDataBuilder = new FlowCapableNodeConnectorQueueStatisticsDataBuilder(); - + FlowCapableNodeConnectorQueueStatisticsBuilder queueStatisticsBuilder = new FlowCapableNodeConnectorQueueStatisticsBuilder(); - + queueStatisticsBuilder.fieldsFrom(swQueueStats); - + queueStatisticsDataBuilder.setFlowCapableNodeConnectorQueueStatistics(queueStatisticsBuilder.build()); - - cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap() - .get(swQueueStats.getNodeConnectorId()) - .put(swQueueStats.getQueueId(), queueStatisticsBuilder.build()); - - + DataModificationTransaction it = this.statisticsManager.startChange(); - InstanceIdentifier queueRef + InstanceIdentifier queueRef = InstanceIdentifier.builder(Nodes.class) .child(Node.class, key) .child(NodeConnector.class, new NodeConnectorKey(swQueueStats.getNodeConnectorId())) .augmentation(FlowCapableNodeConnector.class) .child(Queue.class, new QueueKey(swQueueStats.getQueueId())).toInstance(); - + QueueBuilder queueBuilder = new QueueBuilder(); queueBuilder.addAugmentation(FlowCapableNodeConnectorQueueStatisticsData.class, queueStatisticsDataBuilder.build()); queueBuilder.setKey(new QueueKey(swQueueStats.getQueueId())); - sucLogger.trace("Augmenting queue statistics {} of queue {} to port {}" + sucLogger.info("Augmenting queue statistics {} of queue {} to port {}" ,queueStatisticsDataBuilder.build().toString(), swQueueStats.getQueueId(), swQueueStats.getNodeConnectorId()); - + it.putOperationalData(queueRef, queueBuilder.build()); it.commit(); - + } - + } private NodeRef getNodeRef(NodeKey nodeKey){ InstanceIdentifierBuilder builder = InstanceIdentifier.builder(Nodes.class).child(Node.class, nodeKey); return new NodeRef(builder.toInstance()); } - + public boolean flowEquals(Flow statsFlow, Flow storedFlow) { if (statsFlow.getClass() != storedFlow.getClass()) { return false; @@ -780,28 +750,28 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } return true; } - + /** * Explicit equals method to compare the 'match' for flows stored in the data-stores and flow fetched from the switch. - * Usecase: e.g If user don't set any ethernet source and destination address for match,data store will store null for + * Usecase: e.g If user don't set any ethernet source and destination address for match,data store will store null for * these address. * e.g [_ethernetMatch=EthernetMatch [_ethernetDestination=null, _ethernetSource=null, _ethernetType= * EthernetType [_type=EtherType [_value=2048], _mask=null, augmentation=[]] - * - * But when you fetch the flows from switch, openflow driver library converts all zero bytes of mac address in the - * message stream to 00:00:00:00:00:00. Following string shows how library interpret the zero mac address bytes and - * eventually when translator convert it to MD-SAL match, this is how it looks - * [_ethernetDestination=EthernetDestination [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], - * _ethernetSource=EthernetSource [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], + * + * But when you fetch the flows from switch, openflow driver library converts all zero bytes of mac address in the + * message stream to 00:00:00:00:00:00. Following string shows how library interpret the zero mac address bytes and + * eventually when translator convert it to MD-SAL match, this is how it looks + * [_ethernetDestination=EthernetDestination [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], + * _ethernetSource=EthernetSource [_address=MacAddress [_value=00:00:00:00:00:00], _mask=null, augmentation=[]], * _ethernetType=EthernetType [_type=EtherType [_value=2048], _mask=null, augmentation=[]] - * - * Similarly for inPort, if user/application don't set any value for it, FRM will store null value for it in data store. + * + * Similarly for inPort, if user/application don't set any value for it, FRM will store null value for it in data store. * When we fetch the same flow (with its statistics) from switch, plugin converts its value to openflow:X:0. - * e.g _inPort=Uri [_value=openflow:1:0] - * + * e.g _inPort=Uri [_value=openflow:1:0] + * * So this custom equals method add additional check to take care of these scenario, in case any match element is null in data-store-flow, but not * in the flow fetched from switch. - * + * * @param statsFlow * @param storedFlow * @return