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=cf870b9474f14659a68d3fba504962ba859a94fa;hp=e7f6129aa5018c44baa9be2110597fab05c519a3;hpb=e8a1199eb50859f4d8a80322b168f7167add9822;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 e7f6129aa5..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,11 +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.match.types.rev131026.match.EthernetMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.VlanMatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4Match; -import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.TcpMatch; -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; @@ -130,7 +125,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList private final StatisticsProvider statisticsManager; - private final int unaccountedFlowsCounter = 1; + private int unaccountedFlowsCounter = 1; public StatisticsUpdateCommiter(final StatisticsProvider manager){ @@ -147,19 +142,19 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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 meterConfigStatsList = notification.getMeterConfigStats(); - List eterConfigStatsList = notification.getMeterConfigStats(); - - for(MeterConfigStats meterConfigStats : eterConfigStatsList){ + for(MeterConfigStats meterConfigStats : meterConfigStatsList){ DataModificationTransaction it = this.statisticsManager.startChange(); MeterBuilder meterBuilder = new MeterBuilder(); MeterKey meterKey = new MeterKey(meterConfigStats.getMeterId()); @@ -189,13 +184,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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(); @@ -231,15 +219,16 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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){ @@ -273,13 +262,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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(); @@ -310,11 +292,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @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()); @@ -322,8 +299,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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()); @@ -346,18 +321,11 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList @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(); @@ -431,14 +399,13 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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 @@ -496,11 +463,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))); - FlowKey newFlowKey = new FlowKey(new FlowId(flowKey)); + 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) .child(Table.class, new TableKey(tableId)) @@ -538,12 +530,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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(); @@ -564,13 +550,6 @@ 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){ @@ -590,9 +569,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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 = new FlowCapableNodeConnectorStatisticsDataBuilder(); @@ -639,12 +615,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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(); @@ -666,17 +636,18 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList 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(); @@ -686,11 +657,6 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList queueStatisticsDataBuilder.setFlowCapableNodeConnectorQueueStatistics(queueStatisticsBuilder.build()); - cache.get(notification.getId()).getNodeConnectorAndQueuesStatsMap() - .get(swQueueStats.getNodeConnectorId()) - .put(swQueueStats.getQueueId(), queueStatisticsBuilder.build()); - - DataModificationTransaction it = this.statisticsManager.startChange(); InstanceIdentifier queueRef @@ -810,6 +776,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList * @param storedFlow * @return */ + public boolean matchEquals(Match statsFlow, Match storedFlow) { if (statsFlow == storedFlow) { return true; @@ -819,12 +786,9 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } if (storedFlow.getEthernetMatch() == null) { if (statsFlow.getEthernetMatch() != null) { - if(!statsFlow.getEthernetMatch().getEthernetDestination().getAddress().getValue().equals("00:00:00:00:00:00") || - !statsFlow.getEthernetMatch().getEthernetSource().getAddress().getValue().equals("00:00:00:00:00:00")){ - return false; - } + return false; } - } else if(!EthernetMatchEquals(statsFlow.getEthernetMatch(),storedFlow.getEthernetMatch())) { + } else if(!storedFlow.getEthernetMatch().equals(statsFlow.getEthernetMatch())) { return false; } if (storedFlow.getIcmpv4Match()== null) { @@ -850,12 +814,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } if (storedFlow.getInPort()== null) { if (statsFlow.getInPort() != null) { - String[] portArr = statsFlow.getInPort().getValue().split(":"); - if(portArr.length >= 3){ - if(Integer.parseInt(portArr[2]) != 0){ - return false; - } - } + return false; } } else if(!storedFlow.getInPort().equals(statsFlow.getInPort())) { return false; @@ -869,22 +828,14 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } if (storedFlow.getLayer3Match()== null) { if (statsFlow.getLayer3Match() != null) { - Ipv4Match ipv4Match = (Ipv4Match)statsFlow.getLayer3Match(); - if(!ipv4Match.getIpv4Source().getValue().equals("0.0.0.0/0") || - !ipv4Match.getIpv4Destination().getValue().equals("0.0.0.0/0")){ return false; - } } } else if(!storedFlow.getLayer3Match().equals(statsFlow.getLayer3Match())) { return false; } if (storedFlow.getLayer4Match()== null) { if (statsFlow.getLayer4Match() != null) { - TcpMatch tcpMatch = (TcpMatch)statsFlow.getLayer4Match(); - if(!tcpMatch.getTcpDestinationPort().getValue().equals(0) || - !tcpMatch.getTcpSourcePort().getValue().equals(0)){ - return false; - } + return false; } } else if(!storedFlow.getLayer4Match().equals(statsFlow.getLayer4Match())) { return false; @@ -912,49 +863,11 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList } if (storedFlow.getVlanMatch()== null) { if (statsFlow.getVlanMatch() != null) { - VlanMatch vlanMatch = statsFlow.getVlanMatch(); - if(!vlanMatch.getVlanId().getVlanId().getValue().equals(0) || - !vlanMatch.getVlanPcp().getValue().equals((short)0)){ - return false; - } + return false; } } else if(!storedFlow.getVlanMatch().equals(statsFlow.getVlanMatch())) { return false; } return true; } - - public boolean EthernetMatchEquals(EthernetMatch statsEtherMatch, EthernetMatch storedEtherMatch) { - if (statsEtherMatch == storedEtherMatch) { - return true; - } - if (storedEtherMatch.getEthernetDestination()== null) { - if (statsEtherMatch.getEthernetDestination() != null) { - if(!statsEtherMatch.getEthernetDestination().getAddress().getValue().equals("00:00:00:00:00:00")){ - return false; - } - } - } else if(!storedEtherMatch.getEthernetDestination().equals(statsEtherMatch.getEthernetDestination())) { - return false; - } - if (storedEtherMatch.getEthernetSource() == null) { - if (statsEtherMatch.getEthernetSource() != null) { - if(!statsEtherMatch.getEthernetSource().getAddress().getValue().equals("00:00:00:00:00:00")){ - return false; - } - } - } else if(!storedEtherMatch.getEthernetSource().equals(statsEtherMatch.getEthernetSource())) { - return false; - } - if (storedEtherMatch.getEthernetType() == null) { - if (statsEtherMatch.getEthernetType() != null) { - if(!statsEtherMatch.getEthernetType().getType().getValue().equals(0)){ - return false; - } - } - } else if(!storedEtherMatch.getEthernetType().equals(statsEtherMatch.getEthernetType())) { - return false; - } - return true; - } }