import org.opendaylight.controller.md.sal.binding.api.NotificationService;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
+import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueHandlerRegistration;
import org.opendaylight.openflowplugin.api.ConnectionException;
import org.opendaylight.openflowplugin.api.OFConstants;
import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
+import org.opendaylight.openflowplugin.api.openflow.connection.OutboundQueueProvider;
+import org.opendaylight.openflowplugin.api.openflow.connection.ThrottledNotificationsOfferer;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceManager;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceState;
import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageIntelligenceAgency;
import org.opendaylight.openflowplugin.impl.common.MultipartRequestInputFactory;
import org.opendaylight.openflowplugin.impl.common.NodeStaticReplyTranslatorUtil;
+import org.opendaylight.openflowplugin.impl.connection.OutboundQueueProviderImpl;
+import org.opendaylight.openflowplugin.impl.connection.ThrottledNotificationsOffererImpl;
import org.opendaylight.openflowplugin.impl.device.listener.OpenflowProtocolListenerFullImpl;
import org.opendaylight.openflowplugin.impl.rpc.RequestContextImpl;
import org.opendaylight.openflowplugin.impl.services.OFJResult2RequestCtxFuture;
-import org.opendaylight.openflowplugin.impl.statistics.ofpspecific.MessageIntelligenceAgencyImpl;
import org.opendaylight.openflowplugin.impl.util.DeviceStateUtil;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.CapabilitiesV10;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.MultipartReplyBody;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyDescCase;
private static final Logger LOG = LoggerFactory.getLogger(DeviceManagerImpl.class);
- private static final long TICK_DURATION = 500; // 0.5 sec.
+ private static final long TICK_DURATION = 10; // 0.5 sec.
private ScheduledThreadPoolExecutor spyPool;
private final int spyRate = 10;
private DeviceInitializationPhaseHandler deviceInitPhaseHandler;
private NotificationService notificationService;
private NotificationPublishService notificationPublishService;
+ private ThrottledNotificationsOfferer<PacketInMessage> throttledNotificationsOfferer;
- private final List<DeviceContext> synchronizedDeviceContextsList = new ArrayList<DeviceContext>();
- private final MessageIntelligenceAgency messageIntelligenceAgency = new MessageIntelligenceAgencyImpl();
+ private final List<DeviceContext> deviceContexts = new ArrayList<DeviceContext>();
+ private final MessageIntelligenceAgency messageIntelligenceAgency;
- public DeviceManagerImpl(@Nonnull final DataBroker dataBroker) {
+ private final long barrierNanos = 500000000L;
+ private final int maxQueueDepth = 1024;
+
+ public DeviceManagerImpl(@Nonnull final DataBroker dataBroker,
+ @Nonnull final MessageIntelligenceAgency messageIntelligenceAgency) {
this.dataBroker = Preconditions.checkNotNull(dataBroker);
- hashedWheelTimer = new HashedWheelTimer(TICK_DURATION, TimeUnit.MILLISECONDS, 10);
+ hashedWheelTimer = new HashedWheelTimer(TICK_DURATION, TimeUnit.MILLISECONDS, 500);
/* merge empty nodes to oper DS to predict any problems with missing parent for Node */
final WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
tx.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Nodes.class), new NodesBuilder().build());
tx.submit();
+ this.messageIntelligenceAgency = messageIntelligenceAgency;
+
emptyRequestContextStack = new RequestContextStack() {
@Override
public <T> void forgetRequestContext(final RequestContext<T> requestContext) {
return new RequestContextImpl<>(this);
}
};
- spyPool = new ScheduledThreadPoolExecutor(1);
- spyPool.scheduleAtFixedRate(messageIntelligenceAgency, spyRate, spyRate, TimeUnit.SECONDS);
}
@Override
// final phase - we have to add new Device to MD-SAL DataStore
Preconditions.checkNotNull(deviceContext);
((DeviceContextImpl) deviceContext).submitTransaction();
- new BarrierTaskBuilder(deviceContext).buildAndFireBarrierTask();
}
@Override
final DeviceState deviceState = new DeviceStateImpl(connectionContext.getFeatures(), connectionContext.getNodeId());
- final DeviceContext deviceContext = new DeviceContextImpl(connectionContext, deviceState, dataBroker, hashedWheelTimer, messageIntelligenceAgency);
+ final DeviceContext deviceContext = new DeviceContextImpl(connectionContext, deviceState, dataBroker, hashedWheelTimer, messageIntelligenceAgency, throttledNotificationsOfferer);
deviceContext.setNotificationService(notificationService);
deviceContext.setNotificationPublishService(notificationPublishService);
final ListenableFuture<List<RpcResult<List<MultipartReply>>>> deviceFeaturesFuture;
final Short version = connectionContext.getFeatures().getVersion();
+
+ OutboundQueueProvider outboundQueueProvider = new OutboundQueueProviderImpl(version);
+ connectionContext.getConnectionAdapter().registerOutboundQueueHandler(outboundQueueProvider, maxQueueDepth, barrierNanos);
+ connectionContext.setOutboundQueueProvider(outboundQueueProvider);
+
if (OFConstants.OFP_VERSION_1_0 == version) {
final CapabilitiesV10 capabilitiesV10 = connectionContext.getFeatures().getCapabilitiesV10();
}
} else if (OFConstants.OFP_VERSION_1_3 == version) {
final Capabilities capabilities = connectionContext.getFeatures().getCapabilities();
+ LOG.debug("Setting capabilities for device {}", deviceContext.getDeviceState().getNodeId());
DeviceStateUtil.setDeviceStateBasedOnV13Capabilities(deviceState, capabilities);
deviceFeaturesFuture = createDeviceFeaturesForOF13(messageListener, deviceContext, deviceState);
} else {
allSucceeded &= rpcResult.isSuccessful();
}
if (allSucceeded) {
- synchronized (deviceContext) {
- createEmptyFlowCapableNodeInDs(deviceContext);
- makeEmptyTables(deviceContext, deviceContext.getDeviceState().getNodeInstanceIdentifier(),
- deviceContext.getDeviceState().getFeatures().getTables());
- }
+ createEmptyFlowCapableNodeInDs(deviceContext);
+ makeEmptyTables(deviceContext, deviceContext.getDeviceState().getNodeInstanceIdentifier(),
+ deviceContext.getDeviceState().getFeatures().getTables());
}
}
private ListenableFuture<RpcResult<List<MultipartReply>>> getNodeStaticInfo(final MultiMsgCollector multiMsgCollector, final MultipartType type, final DeviceContext deviceContext,
final InstanceIdentifier<Node> nodeII, final short version) {
- final Xid xid = deviceContext.getNextXid();
+ final OutboundQueue outboundQueue = deviceContext.getPrimaryConnectionContext().getOutboundQueueProvider().getOutboundQueue();
+
+ long reservedXid;
+ synchronized (outboundQueue) {
+ reservedXid = outboundQueue.reserveEntry();
+ }
+ final Xid xid = new Xid(reservedXid);
+
final RequestContext<List<MultipartReply>> requestContext = emptyRequestContextStack.createRequestContext();
requestContext.setXid(xid);
LOG.trace("Hooking xid {} to device context - precaution.", requestContext.getXid().getValue());
deviceContext.hookRequestCtx(requestContext.getXid(), requestContext);
+ final ListenableFuture<RpcResult<List<MultipartReply>>> requestContextFuture = requestContext.getFuture();
multiMsgCollector.registerMultipartXid(xid.getValue());
- Futures.addCallback(requestContext.getFuture(), new FutureCallback<RpcResult<List<MultipartReply>>>() {
+ outboundQueue.commitEntry(reservedXid, MultipartRequestInputFactory.makeMultipartRequestInput(xid.getValue(), version, type), new FutureCallback<OfHeader>() {
+ @Override
+ public void onSuccess(final OfHeader ofHeader) {
+ LOG.info("Static node {} info: {} collected", type);
+ }
+
+
+ @Override
+ public void onFailure(final Throwable t) {
+ LOG.info("Failed to retrieve static node {} info: {}", type, t.getMessage());
+ }
+ });
+
+ Futures.addCallback(requestContextFuture, new FutureCallback<RpcResult<List<MultipartReply>>>() {
@Override
public void onSuccess(final RpcResult<List<MultipartReply>> rpcResult) {
final List<MultipartReply> result = rpcResult.getResult();
final Iterator<RpcError> rpcErrorIterator = rpcResult.getErrors().iterator();
while (rpcErrorIterator.hasNext()) {
final RpcError rpcError = rpcErrorIterator.next();
- LOG.info("Failed to retrieve static node {} info: {}", type, rpcError.getMessage());
+ LOG.info("Failed to retrieve static node {} info: {}", type, rpcError.getMessage());
if (null != rpcError.getCause()) {
LOG.trace("Detailed error:", rpcError.getCause());
}
}
@Override
- public void onFailure(final Throwable t) {
- LOG.info("Failed to retrieve static node {} info: {}", type, t.getMessage());
+ public void onFailure(final Throwable throwable) {
+
}
});
+
+/*
final ListenableFuture<RpcResult<Void>> rpcFuture = JdkFutureAdapters.listenInPoolThread(deviceContext.getPrimaryConnectionContext().getConnectionAdapter()
.multipartRequest(MultipartRequestInputFactory.makeMultipartRequestInput(xid.getValue(), version, type)));
final OFJResult2RequestCtxFuture OFJResult2RequestCtxFuture = new OFJResult2RequestCtxFuture(requestContext, deviceContext);
OFJResult2RequestCtxFuture.processResultFromOfJava(rpcFuture);
+*/
return requestContext.getFuture();
}
@Override
public void close() throws Exception {
- for (final DeviceContext deviceContext : synchronizedDeviceContextsList) {
+ for (final DeviceContext deviceContext : deviceContexts) {
deviceContext.close();
}
+ if (throttledNotificationsOfferer != null) {
+ throttledNotificationsOfferer.close();
+ }
}
private static void createEmptyFlowCapableNodeInDs(final DeviceContext deviceContext) {
@Override
public void onDeviceContextClosed(final DeviceContext deviceContext) {
- synchronizedDeviceContextsList.remove(deviceContext);
+ deviceContexts.remove(deviceContext);
+ }
+
+ @Override
+ public void initialize() {
+ spyPool = new ScheduledThreadPoolExecutor(1);
+ spyPool.scheduleAtFixedRate(messageIntelligenceAgency, spyRate, spyRate, TimeUnit.SECONDS);
+
+ throttledNotificationsOfferer = new ThrottledNotificationsOffererImpl<>(notificationPublishService, messageIntelligenceAgency);
}
}
Code Review / openflowplugin.git / blobdiff