import io.netty.util.Timeout;
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import javax.annotation.Nonnull;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import org.opendaylight.controller.md.sal.binding.api.NotificationService;
import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
+import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
+import org.opendaylight.openflowplugin.api.openflow.connection.ThrottledConnectionsHolder;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceState;
import org.opendaylight.openflowplugin.api.openflow.device.MessageTranslator;
private final DataBroker dataBroker;
private final XidGenerator xidGenerator;
private final HashedWheelTimer hashedWheelTimer;
- private Map<Long, RequestContext> requests = Collections.synchronizedMap(new TreeMap());
+ private final Map<Long, RequestContext> requests = new TreeMap<>();
private final Map<SwitchConnectionDistinguisher, ConnectionContext> auxiliaryConnectionContexts;
private final TransactionChainManager txChainManager;
private final DeviceGroupRegistry deviceGroupRegistry;
private final DeviceMeterRegistry deviceMeterRegistry;
private Timeout barrierTaskTimeout;
- private NotificationProviderService notificationService;
+ private NotificationService notificationService;
private final MessageSpy<Class> messageSpy;
private DeviceDisconnectedHandler deviceDisconnectedHandler;
- private List<DeviceContextClosedHandler> closeHandlers = new ArrayList<>();
+ private final List<DeviceContextClosedHandler> closeHandlers = new ArrayList<>();
+ private NotificationPublishService notificationPublishService;
+ private final ThrottledConnectionsHolder throttledConnectionsHolder;
@VisibleForTesting
@Nonnull final DeviceState deviceState,
@Nonnull final DataBroker dataBroker,
@Nonnull final HashedWheelTimer hashedWheelTimer,
- @Nonnull final MessageSpy _messageSpy) {
+ @Nonnull final MessageSpy _messageSpy,
+ @Nonnull final ThrottledConnectionsHolder throttledConnectionsHolder) {
this.primaryConnectionContext = Preconditions.checkNotNull(primaryConnectionContext);
this.deviceState = Preconditions.checkNotNull(deviceState);
this.dataBroker = Preconditions.checkNotNull(dataBroker);
xidGenerator = new XidGenerator();
txChainManager = new TransactionChainManager(dataBroker, hashedWheelTimer, 500L, 500L);
auxiliaryConnectionContexts = new HashMap<>();
- requests = new HashMap<>();
deviceFlowRegistry = new DeviceFlowRegistryImpl();
deviceGroupRegistry = new DeviceGroupRegistryImpl();
deviceMeterRegistry = new DeviceMeterRegistryImpl();
messageSpy = _messageSpy;
+ this.throttledConnectionsHolder = throttledConnectionsHolder;
}
/**
* and we are able to set a scheduler for an automatic transaction submitting by time (0,5sec).
*/
void submitTransaction() {
+ txChainManager.enableSubmit();
txChainManager.submitTransaction();
- txChainManager.enableCounter();
}
@Override
@Override
public void addAuxiliaryConenctionContext(final ConnectionContext connectionContext) {
- final SwitchConnectionDistinguisher connectionDistinguisher = new SwitchConnectionCookieOFImpl(connectionContext.getFeatures().getAuxiliaryId());
+ final SwitchConnectionDistinguisher connectionDistinguisher = createConnectionDistinguisher(connectionContext);
auxiliaryConnectionContexts.put(connectionDistinguisher, connectionContext);
}
+ private SwitchConnectionDistinguisher createConnectionDistinguisher(final ConnectionContext connectionContext) {
+ return new SwitchConnectionCookieOFImpl(connectionContext.getFeatures().getAuxiliaryId());
+ }
+
@Override
public void removeAuxiliaryConenctionContext(final ConnectionContext connectionContext) {
// TODO Auto-generated method stub
}
@Override
- public RequestContext lookupRequest(Xid xid) {
- return requests.get(xid.getValue());
+ public RequestContext lookupRequest(final Xid xid) {
+ synchronized (requests) {
+ return requests.get(xid.getValue());
+ }
}
@Override
public int getNumberOfOutstandingRequests() {
- return requests.size();
+ synchronized (requests) {
+ return requests.size();
+ }
}
@Override
public void hookRequestCtx(final Xid xid, final RequestContext requestFutureContext) {
- requests.put(xid.getValue(), requestFutureContext);
+ synchronized (requests) {
+ requests.put(xid.getValue(), requestFutureContext);
+ }
}
@Override
- public RequestContext unhookRequestCtx(Xid xid) {
- return requests.remove(xid.getValue());
+ public RequestContext unhookRequestCtx(final Xid xid) {
+ synchronized (requests) {
+ return requests.remove(xid.getValue());
+ }
}
@Override
@Override
public void processReply(final OfHeader ofHeader) {
- final RequestContext requestContext = requests.get(ofHeader.getXid());
+ final RequestContext requestContext = requests.remove(ofHeader.getXid());
if (null != requestContext) {
final SettableFuture replyFuture = requestContext.getFuture();
- requests.remove(ofHeader.getXid());
RpcResult<OfHeader> rpcResult;
if (ofHeader instanceof Error) {
//TODO : this is the point, where we can discover that add flow operation failed and where we should
//TODO : remove this flow from deviceFlowRegistry
final Error error = (Error) ofHeader;
- final String message = "Operation on device failed";
+ final String message = "Operation on device failed with xid " + ofHeader.getXid() + ".";
rpcResult = RpcResultBuilder
.<OfHeader>failed()
.withError(RpcError.ErrorType.APPLICATION, message, new DeviceDataException(message, error))
try {
requestContext.close();
} catch (final Exception e) {
- LOG.error("Closing RequestContext failed: ", e);
+ LOG.warn("Closing RequestContext failed: {}", e.getMessage());
+ LOG.debug("Closing RequestContext failed.. ", e);
}
} else {
- LOG.error("Can't find request context registered for xid : {}. Type of reply: {}. From address: {}", ofHeader.getXid(), ofHeader.getClass().getName(),
+ LOG.warn("Can't find request context registered for xid : {}. Type of reply: {}. From address: {}", ofHeader.getXid(), ofHeader.getClass().getName(),
getPrimaryConnectionContext().getConnectionAdapter().getRemoteAddress());
}
}
@Override
public void processReply(final Xid xid, final List<MultipartReply> ofHeaderList) {
- final RequestContext requestContext = requests.get(xid.getValue());
+ final RequestContext requestContext;
+ synchronized (requests) {
+ requestContext = requests.remove(xid.getValue());
+ }
if (null != requestContext) {
final SettableFuture replyFuture = requestContext.getFuture();
- requests.remove(xid.getValue());
final RpcResult<List<MultipartReply>> rpcResult = RpcResultBuilder
.<List<MultipartReply>>success()
.withResult(ofHeaderList)
.build();
replyFuture.set(rpcResult);
- for (MultipartReply multipartReply : ofHeaderList) {
+ for (final MultipartReply multipartReply : ofHeaderList) {
messageSpy.spyMessage(multipartReply.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_FAILURE);
}
try {
requestContext.close();
} catch (final Exception e) {
- LOG.error("Closing RequestContext failed: ", e);
+ LOG.warn("Closing RequestContext failed: {}", e.getMessage());
+ LOG.debug("Closing RequestContext failed.. ", e);
}
} else {
- LOG.error("Can't find request context registered for xid : {}. Type of reply: MULTIPART. From address: {}", xid.getValue(),
+ LOG.warn("Can't find request context registered for xid : {}. Type of reply: MULTIPART. From address: {}", xid.getValue(),
getPrimaryConnectionContext().getConnectionAdapter().getRemoteAddress());
}
}
LOG.trace("Processing exception for xid : {}", xid.getValue());
- final RequestContext requestContext = requests.get(xid.getValue());
+ final RequestContext requestContext = requests.remove(xid.getValue());
if (null != requestContext) {
final SettableFuture replyFuture = requestContext.getFuture();
- requests.remove(xid.getValue());
final RpcResult<List<OfHeader>> rpcResult = RpcResultBuilder
.<List<OfHeader>>failed()
.withError(RpcError.ErrorType.APPLICATION, String.format("Message processing failed : %s", deviceDataException.getError()), deviceDataException)
try {
requestContext.close();
} catch (final Exception e) {
- LOG.error("Closing RequestContext failed: ", e);
+ LOG.warn("Closing RequestContext failed: ", e);
+ LOG.debug("Closing RequestContext failed..", e);
}
} else {
- LOG.error("Can't find request context registered for xid : {}", xid.getValue());
+ LOG.warn("Can't find request context registered for xid : {}. Exception message {}",
+ xid.getValue(), deviceDataException.getMessage());
}
}
}
@Override
- public synchronized void processPortStatusMessage(final PortStatusMessage portStatus) {
+ public void processPortStatusMessage(final PortStatusMessage portStatus) {
messageSpy.spyMessage(portStatus.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_SUCCESS);
final TranslatorKey translatorKey = new TranslatorKey(portStatus.getVersion(), PortGrouping.class.getName());
final MessageTranslator<PortGrouping, FlowCapableNodeConnector> messageTranslator = translatorLibrary.lookupTranslator(translatorKey);
@Override
public void processPacketInMessage(final PacketInMessage packetInMessage) {
- messageSpy.spyMessage(packetInMessage.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_SUCCESS);
- final TranslatorKey translatorKey = new TranslatorKey(packetInMessage.getVersion(), PacketIn.class.getName());
- final MessageTranslator<PacketInMessage, PacketReceived> messageTranslator = translatorLibrary.lookupTranslator(translatorKey);
- final PacketReceived packetReceived = messageTranslator.translate(packetInMessage, this, null);
- notificationService.publish(packetReceived);
+ messageSpy.spyMessage(packetInMessage.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH);
+ final ConnectionAdapter connectionAdapter = this.getPrimaryConnectionContext().getConnectionAdapter();
+ if (connectionAdapter.isAutoRead()) {
+ final TranslatorKey translatorKey = new TranslatorKey(packetInMessage.getVersion(), PacketIn.class.getName());
+ final MessageTranslator<PacketInMessage, PacketReceived> messageTranslator = translatorLibrary.lookupTranslator(translatorKey);
+ final PacketReceived packetReceived = messageTranslator.translate(packetInMessage, this, null);
+
+ if (packetReceived != null) {
+ messageSpy.spyMessage(packetInMessage.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_TRANSLATE_OUT_SUCCESS);
+ } else {
+ messageSpy.spyMessage(packetInMessage.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_TRANSLATE_SRC_FAILURE);
+ }
+ if (!notificationPublishService.offerNotification(packetReceived)) {
+ LOG.debug("Notification offer refused by notification service.");
+ messageSpy.spyMessage(packetInMessage.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_FAILURE);
+ LOG.debug("Notification offer refused by notification service.");
+ connectionAdapter.setAutoRead(false);
+ LOG.debug("Throttling primary connection for {}", connectionAdapter.getRemoteAddress());
+ this.throttledConnectionsHolder.storeThrottledConnection(connectionAdapter);
+ } else {
+ messageSpy.spyMessage(packetInMessage.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.FROM_SWITCH_PUBLISHED_SUCCESS);
+ }
+ }
+
+
}
@Override
}
@Override
- public synchronized HashedWheelTimer getTimer() {
+ public HashedWheelTimer getTimer() {
return hashedWheelTimer;
}
primaryConnectionContext.setConnectionState(ConnectionContext.CONNECTION_STATE.RIP);
primaryConnectionContext.getConnectionAdapter().disconnect();
}
- for (Map.Entry<Long, RequestContext> entry : requests.entrySet()) {
+ for (final Map.Entry<Long, RequestContext> entry : requests.entrySet()) {
RequestContextUtil.closeRequestContextWithRpcError(entry.getValue(), DEVICE_DISCONNECTED);
}
- for (ConnectionContext connectionContext : auxiliaryConnectionContexts.values()) {
+ for (final ConnectionContext connectionContext : auxiliaryConnectionContexts.values()) {
if (connectionContext.getConnectionAdapter().isAlive()) {
connectionContext.getConnectionAdapter().disconnect();
}
}
- for (DeviceContextClosedHandler deviceContextClosedHandler : closeHandlers) {
+ for (final DeviceContextClosedHandler deviceContextClosedHandler : closeHandlers) {
deviceContextClosedHandler.onDeviceContextClosed(this);
}
}
@Override
- public synchronized void onDeviceDisconnected(final ConnectionContext connectionContext) {
+ public void onDeviceDisconnected(final ConnectionContext connectionContext) {
if (this.getPrimaryConnectionContext().equals(connectionContext)) {
try {
close();
- } catch (Exception e) {
+ } catch (final Exception e) {
LOG.trace("Error closing device context.");
}
if (null != deviceDisconnectedHandler) {
deviceDisconnectedHandler.onDeviceDisconnected(connectionContext);
}
} else {
- auxiliaryConnectionContexts.remove(connectionContext);
+ final SwitchConnectionDistinguisher connectionDistinguisher = createConnectionDistinguisher(connectionContext);
+ auxiliaryConnectionContexts.remove(connectionDistinguisher);
}
}
@Override
public RequestContext extractNextOutstandingMessage(final long barrierXid) {
RequestContext nextMessage = null;
- final Iterator<Long> keyIterator = requests.keySet().iterator();
- if (keyIterator.hasNext()) {
- final Long oldestXid = keyIterator.next();
- if (oldestXid < barrierXid) {
- nextMessage = requests.remove(oldestXid);
+ synchronized (requests) {
+ final Iterator<Long> keyIterator = requests.keySet().iterator();
+ if (keyIterator.hasNext()) {
+ final Long oldestXid = keyIterator.next();
+ if (oldestXid < barrierXid) {
+ nextMessage = requests.remove(oldestXid);
+ }
}
}
return nextMessage;
}
@Override
- public void setNotificationService(final NotificationProviderService notificationServiceParam) {
+ public void setNotificationService(final NotificationService notificationServiceParam) {
notificationService = notificationServiceParam;
}
+ @Override
+ public void setNotificationPublishService(final NotificationPublishService notificationPublishService) {
+ this.notificationPublishService = notificationPublishService;
+ }
+
@Override
public MessageSpy getMessageSpy() {
return messageSpy;
public void addDeviceContextClosedHandler(final DeviceContextClosedHandler deviceContextClosedHandler) {
this.closeHandlers.add(deviceContextClosedHandler);
}
+
+ @Override
+ public void startGatheringOperationsToOneTransaction() {
+ txChainManager.startGatheringOperationsToOneTransaction();
+ }
+
+ @Override
+ public void commitOperationsGatheredInOneTransaction() {
+ txChainManager.commitOperationsGatheredInOneTransaction();
+ }
+
}
Code Review / openflowplugin.git / blobdiff