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=d8bea7c63a4606fffaed51a9dce5fe889dca2d36;hp=842cdaf29273de408c01ab4257a7c6d6697e3355;hb=aae447eb2ce6272e1bfd2517a6493bf2ea40ed7a;hpb=fd3193d2efe85828156e6a670b5c06a0ea485a98 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 842cdaf292..d8bea7c63a 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 @@ -9,32 +9,19 @@ package org.opendaylight.controller.md.statistics.manager; import java.util.Collection; import java.util.Timer; -import java.util.TimerTask; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.TimeUnit; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; -import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; import org.opendaylight.controller.sal.binding.api.data.DataChangeListener; -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.FlowCapableNodeConnector; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter; -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.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.OpendaylightFlowStatisticsService; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.OpendaylightFlowTableStatisticsService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.Queue; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.queue.rev130925.QueueId; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.OpendaylightGroupStatisticsService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; 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.OpendaylightMeterStatisticsService; @@ -42,7 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.O import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.OpendaylightQueueStatisticsService; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.NotificationListener; import org.slf4j.Logger; @@ -63,8 +49,6 @@ import com.google.common.base.Preconditions; * */ public class StatisticsProvider implements AutoCloseable { - public static final long STATS_COLLECTION_MILLIS = TimeUnit.SECONDS.toMillis(15); - private static final Logger spLogger = LoggerFactory.getLogger(StatisticsProvider.class); private final ConcurrentMap handlers = new ConcurrentHashMap<>(); @@ -82,11 +66,12 @@ public class StatisticsProvider implements AutoCloseable { private OpendaylightFlowTableStatisticsService flowTableStatsService; private OpendaylightQueueStatisticsService queueStatsService; - - private StatisticsUpdateHandler statsUpdateHandler; + + private final StatisticsRequestScheduler srScheduler; public StatisticsProvider(final DataProviderService dataService) { this.dps = Preconditions.checkNotNull(dataService); + this.srScheduler = new StatisticsRequestScheduler(); } private final StatisticsListener updateCommiter = new StatisticsListener(StatisticsProvider.this); @@ -95,7 +80,7 @@ public class StatisticsProvider implements AutoCloseable { private ListenerRegistration flowCapableTrackerRegistration; - public void start(final DataBrokerService dbs, final NotificationProviderService nps, final RpcConsumerRegistry rpcRegistry) { + public void start(final NotificationProviderService nps, final RpcConsumerRegistry rpcRegistry) { // Get Group/Meter statistics service instances groupStatsService = rpcRegistry.getRpcService(OpendaylightGroupStatisticsService.class); @@ -104,7 +89,8 @@ public class StatisticsProvider implements AutoCloseable { portStatsService = rpcRegistry.getRpcService(OpendaylightPortStatisticsService.class); flowTableStatsService = rpcRegistry.getRpcService(OpendaylightFlowTableStatisticsService.class); queueStatsService = rpcRegistry.getRpcService(OpendaylightQueueStatisticsService.class); - + this.srScheduler.start(); + // Start receiving notifications this.listenerRegistration = nps.registerNotificationListener(this.updateCommiter); @@ -112,99 +98,12 @@ public class StatisticsProvider implements AutoCloseable { final InstanceIdentifier fcnId = InstanceIdentifier.builder(Nodes.class) .child(Node.class).augmentation(FlowCapableNode.class).build(); spLogger.debug("Registering FlowCapable tracker to {}", fcnId); - this.flowCapableTrackerRegistration = dbs.registerDataChangeListener(fcnId, + this.flowCapableTrackerRegistration = dps.registerDataChangeListener(fcnId, new FlowCapableTracker(this, fcnId)); - statsUpdateHandler = new StatisticsUpdateHandler(StatisticsProvider.this); - registerDataStoreUpdateListener(dbs); - - timer.schedule(new TimerTask() { - @Override - public void run() { - try { - // Send stats requests - for (NodeStatisticsHandler h : handlers.values()) { - h.requestPeriodicStatistics(); - } - - // Perform cleanup - for(NodeStatisticsHandler nodeStatisticsAger : handlers.values()){ - nodeStatisticsAger.cleanStaleStatistics(); - } - - } catch (RuntimeException e) { - spLogger.warn("Failed to request statistics", e); - } - } - }, 0, STATS_COLLECTION_MILLIS); - - spLogger.debug("Statistics timer task with timer interval : {}ms", STATS_COLLECTION_MILLIS); spLogger.info("Statistics Provider started."); } - private void registerDataStoreUpdateListener(DataBrokerService dbs) { - // FIXME: the below should be broken out into StatisticsUpdateHandler - - //Register for flow updates - InstanceIdentifier pathFlow = InstanceIdentifier.builder(Nodes.class).child(Node.class) - .augmentation(FlowCapableNode.class) - .child(Table.class) - .child(Flow.class).toInstance(); - dbs.registerDataChangeListener(pathFlow, statsUpdateHandler); - - //Register for meter updates - InstanceIdentifier pathMeter = InstanceIdentifier.builder(Nodes.class).child(Node.class) - .augmentation(FlowCapableNode.class) - .child(Meter.class).toInstance(); - - dbs.registerDataChangeListener(pathMeter, statsUpdateHandler); - - //Register for group updates - InstanceIdentifier pathGroup = InstanceIdentifier.builder(Nodes.class).child(Node.class) - .augmentation(FlowCapableNode.class) - .child(Group.class).toInstance(); - dbs.registerDataChangeListener(pathGroup, statsUpdateHandler); - - //Register for queue updates - InstanceIdentifier pathQueue = InstanceIdentifier.builder(Nodes.class).child(Node.class) - .child(NodeConnector.class) - .augmentation(FlowCapableNodeConnector.class) - .child(Queue.class).toInstance(); - dbs.registerDataChangeListener(pathQueue, statsUpdateHandler); - } - - protected DataModificationTransaction startChange() { - return dps.beginTransaction(); - } - - public void sendFlowStatsFromTableRequest(NodeKey node, Flow flow) { - final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); - if (h != null) { - h.sendFlowStatsFromTableRequest(flow); - } - } - - public void sendGroupDescriptionRequest(NodeKey node) { - final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); - if (h != null) { - h.sendGroupDescriptionRequest(); - } - } - - public void sendMeterConfigStatisticsRequest(NodeKey node) { - final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); - if (h != null) { - h.sendMeterConfigStatisticsRequest(); - } - } - - public void sendQueueStatsFromGivenNodeConnector(NodeKey node,NodeConnectorId nodeConnectorId, QueueId queueId) { - final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); - if (h != null) { - h.sendQueueStatsFromGivenNodeConnector(nodeConnectorId, queueId); - } - } - /** * Get the handler for a particular node. * @@ -249,11 +148,11 @@ public class StatisticsProvider implements AutoCloseable { final NodeStatisticsHandler h = new NodeStatisticsHandler(dps, key, flowStatsService, flowTableStatsService, groupStatsService, - meterStatsService, portStatsService, queueStatsService); + meterStatsService, portStatsService, queueStatsService,srScheduler); final NodeStatisticsHandler old = handlers.putIfAbsent(key.getId(), h); if (old == null) { spLogger.debug("Started node handler for {}", key.getId()); - h.start(); + h.start(timer); } else { spLogger.debug("Prevented race on handler for {}", key.getId()); }