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=9ab1e9c5d1a453a4fc24746a96d2862e5db620a9;hp=af56a84db5611974d0537d65b914df6acbf4adc0;hb=c02e660d9121e93f35f99c773c1ba1a0a40513f7;hpb=b8e98bb0e826534f0164000ca2453cf23f8b0063 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 af56a84db5..9ab1e9c5d1 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,229 +7,269 @@ */ package org.opendaylight.controller.md.statistics.manager; -import java.util.List; +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.Future; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; -import org.eclipse.xtext.xbase.lib.Exceptions; 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.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.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.NodeRef; 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.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.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.OpendaylightMeterStatisticsService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.OpendaylightPortStatisticsService; +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.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Preconditions; + +/** + * Following are main responsibilities of the class: + * 1) Invoke statistics request thread to send periodic statistics request to all the + * flow capable switch connected to the controller. It sends statistics request for + * Group,Meter,Table,Flow,Queue,Aggregate stats. + * + * 2) Invoke statistics ager thread, to clean up all the stale statistics data from + * operational data store. + * + * @author avishnoi@in.ibm.com + * + */ 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); - public final static Logger spLogger = LoggerFactory.getLogger(StatisticsProvider.class); - - private DataProviderService dps; + private final ConcurrentMap handlers = new ConcurrentHashMap<>(); + private final Timer timer = new Timer("statistics-manager", true); + private final DataProviderService dps; - private NotificationProviderService nps; - private OpendaylightGroupStatisticsService groupStatsService; - + private OpendaylightMeterStatisticsService meterStatsService; - - 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 = - 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; + + private OpendaylightFlowStatisticsService flowStatsService; + + private OpendaylightPortStatisticsService portStatsService; + + private OpendaylightFlowTableStatisticsService flowTableStatsService; + + private OpendaylightQueueStatisticsService queueStatsService; + + private StatisticsUpdateHandler statsUpdateHandler; + + public StatisticsProvider(final DataProviderService dataService) { + this.dps = Preconditions.checkNotNull(dataService); } - private final StatisticsUpdateCommiter updateCommiter = new StatisticsUpdateCommiter(StatisticsProvider.this); - + private final StatisticsListener updateCommiter = new StatisticsListener(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); - - statisticsRequesterThread = new Thread( new Runnable(){ + private ListenerRegistration flowCapableTrackerRegistration; + + public void start(final DataBrokerService dbs, final NotificationProviderService nps, final RpcConsumerRegistry rpcRegistry) { + + // Get Group/Meter statistics service instances + groupStatsService = rpcRegistry.getRpcService(OpendaylightGroupStatisticsService.class); + meterStatsService = rpcRegistry.getRpcService(OpendaylightMeterStatisticsService.class); + flowStatsService = rpcRegistry.getRpcService(OpendaylightFlowStatisticsService.class); + portStatsService = rpcRegistry.getRpcService(OpendaylightPortStatisticsService.class); + flowTableStatsService = rpcRegistry.getRpcService(OpendaylightFlowTableStatisticsService.class); + queueStatsService = rpcRegistry.getRpcService(OpendaylightQueueStatisticsService.class); + + // Start receiving notifications + this.listenerRegistration = nps.registerNotificationListener(this.updateCommiter); + + // Register for switch connect/disconnect notifications + 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, + new FlowCapableTracker(this, fcnId)); + + statsUpdateHandler = new StatisticsUpdateHandler(StatisticsProvider.this); + registerDataStoreUpdateListener(dbs); + + timer.schedule(new TimerTask() { @Override public void run() { - while(true){ - try { - statsRequestSender(); - - Thread.sleep(STATS_THREAD_EXECUTION_TIME); - }catch (Exception e){ - spLogger.error("Exception occurred while sending stats request : {}",e); + 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); } } - }); - - spLogger.debug("Statistics requester thread started with timer interval : {}",STATS_THREAD_EXECUTION_TIME); - - statisticsRequesterThread.start(); - + }, 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() { - - 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){ - - - //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:")){ - spLogger.info("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); - }catch(Exception e){ - spLogger.error("Exception occured while sending statistics request : {}", e); - } - } + + public void sendFlowStatsFromTableRequest(NodeKey node, Flow flow) throws InterruptedException, ExecutionException { + final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); + if (h != null) { + h.sendFlowStatsFromTableRequest(flow); } } - - private void sendAllGroupStatisticsRequest(NodeRef targetNode){ - - final GetAllGroupStatisticsInputBuilder input = new GetAllGroupStatisticsInputBuilder(); - - input.setNode(targetNode); - input.setNode(targetNode); - - @SuppressWarnings("unused") - Future> response = - groupStatsService.getAllGroupStatistics(input.build()); - } - - private void sendGroupDescriptionRequest(NodeRef targetNode){ - final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder(); - - input.setNode(targetNode); - - @SuppressWarnings("unused") - Future> response = - groupStatsService.getGroupDescription(input.build()); - } - - private void sendAllMeterStatisticsRequest(NodeRef targetNode){ - - GetAllMeterStatisticsInputBuilder input = new GetAllMeterStatisticsInputBuilder(); - - input.setNode(targetNode); - - @SuppressWarnings("unused") - Future> response = - meterStatsService.getAllMeterStatistics(input.build()); + + public void sendGroupDescriptionRequest(NodeKey node) throws InterruptedException, ExecutionException{ + final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); + if (h != null) { + h.sendGroupDescriptionRequest(); + } } - - private void sendMeterConfigStatisticsRequest(NodeRef targetNode){ - - GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder(); - - input.setNode(targetNode); - - @SuppressWarnings("unused") - Future> response = - meterStatsService.getAllMeterConfigStatistics(input.build()); - + + public void sendMeterConfigStatisticsRequest(NodeKey node) throws InterruptedException, ExecutionException { + final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); + if (h != null) { + h.sendMeterConfigStatisticsRequest(); + } } - - public ConcurrentMap getStatisticsCache() { - return statisticsCache; + + public void sendQueueStatsFromGivenNodeConnector(NodeKey node,NodeConnectorId nodeConnectorId, QueueId queueId) throws InterruptedException, ExecutionException { + final NodeStatisticsHandler h = getStatisticsHandler(node.getId()); + if (h != null) { + h.sendQueueStatsFromGivenNodeConnector(nodeConnectorId, queueId); + } } - - private List getAllConnectedNodes(){ - - Nodes nodes = (Nodes) dps.readOperationalData(nodesIdentifier); - if(nodes == null) - return null; - - spLogger.info("Number of connected nodes : {}",nodes.getNode().size()); - return nodes.getNode(); + + /** + * Get the handler for a particular node. + * + * @param nodeId source node + * @return Node statistics handler for that node. Null if the statistics should + * not handled. + */ + public final NodeStatisticsHandler getStatisticsHandler(final NodeId nodeId) { + Preconditions.checkNotNull(nodeId); + NodeStatisticsHandler handler = handlers.get(nodeId); + if (handler == null) { + spLogger.info("Attempted to get non-existing handler for {}", nodeId); + } + return handler; } - @SuppressWarnings("deprecation") @Override - public void close(){ - + public void close() { try { - spLogger.info("Statistics Provider stopped."); if (this.listenerRegistration != null) { - this.listenerRegistration.close(); - - this.statisticsRequesterThread.destroy(); - + this.listenerRegistration = null; + } + if (this.flowCapableTrackerRegistration != null) { + this.flowCapableTrackerRegistration.close(); + this.flowCapableTrackerRegistration = null; } - } catch (Throwable e) { - throw Exceptions.sneakyThrow(e); - } + timer.cancel(); + } catch (Exception e) { + spLogger.warn("Failed to stop Statistics Provider completely", e); + } finally { + spLogger.info("Statistics Provider stopped."); + } } + void startNodeHandlers(final Collection addedNodes) { + for (NodeKey key : addedNodes) { + if (handlers.containsKey(key.getId())) { + spLogger.warn("Attempted to start already-existing handler for {}, very strange", key.getId()); + continue; + } + + final NodeStatisticsHandler h = new NodeStatisticsHandler(dps, key, + flowStatsService, flowTableStatsService, groupStatsService, + meterStatsService, portStatsService, queueStatsService); + final NodeStatisticsHandler old = handlers.putIfAbsent(key.getId(), h); + if (old == null) { + spLogger.debug("Started node handler for {}", key.getId()); + h.start(); + } else { + spLogger.debug("Prevented race on handler for {}", key.getId()); + } + } + } + + void stopNodeHandlers(final Collection removedNodes) { + for (NodeKey key : removedNodes) { + final NodeStatisticsHandler s = handlers.remove(key.getId()); + if (s != null) { + spLogger.debug("Stopping node handler for {}", key.getId()); + s.close(); + } else { + spLogger.warn("Attempted to remove non-existing handler for {}, very strange", key.getId()); + } + } + } }