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.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.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.NotificationListener;
import org.slf4j.Logger;
*
*/
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<NodeId, NodeStatisticsHandler> handlers = new ConcurrentHashMap<>();
private OpendaylightQueueStatisticsService queueStatsService;
+ 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);
- private Registration<NotificationListener> listenerRegistration;
+ private ListenerRegistration<NotificationListener> listenerRegistration;
private ListenerRegistration<DataChangeListener> flowCapableTrackerRegistration;
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);
this.flowCapableTrackerRegistration = dps.registerDataChangeListener(fcnId,
new FlowCapableTracker(this, fcnId));
- 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.");
}
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());
}