package org.opendaylight.openflowplugin.openflow.md.core;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
import org.opendaylight.openflowjava.protocol.api.connection.ConnectionReadyListener;
+import org.opendaylight.openflowplugin.api.OFConstants;
import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
import org.opendaylight.openflowplugin.openflow.md.core.session.PortFeaturesUtil;
import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;
import org.opendaylight.openflowplugin.openflow.md.core.session.SessionManager;
import org.opendaylight.openflowplugin.openflow.md.queue.QueueKeeper;
+import org.opendaylight.openflowplugin.openflow.md.queue.QueueKeeper.QueueType;
+import org.opendaylight.openflowplugin.openflow.md.queue.QueueKeeperFactory;
+import org.opendaylight.openflowplugin.openflow.md.queue.QueueProcessor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartRequestFlags;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.SwitchConfigFlag;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.EchoReplyInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OpenflowProtocolListener;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketInMessage;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.Port;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatus;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortStatusMessage;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.SetConfigInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestDescCaseBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestGroupFeaturesCaseBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterFeaturesCaseBuilder;
public class ConnectionConductorImpl implements OpenflowProtocolListener,
SystemNotificationsListener, ConnectionConductor, ConnectionReadyListener, HandshakeListener {
+ /** ingress queue limit */
+ private static final int INGRESS_QUEUE_MAX_SIZE = 200;
+
protected static final Logger LOG = LoggerFactory
.getLogger(ConnectionConductorImpl.class);
private ConnectionConductor.CONDUCTOR_STATE conductorState;
private Short version;
- private SwitchConnectionDistinguisher auxiliaryKey;
+ protected SwitchConnectionDistinguisher auxiliaryKey;
- private SessionContext sessionContext;
+ protected SessionContext sessionContext;
- private QueueKeeper<OfHeader, DataObject> queueKeeper;
- private ExecutorService hsPool;
+ private QueueProcessor<OfHeader, DataObject> queueProcessor;
+ private QueueKeeper<OfHeader> queue;
+ private ThreadPoolExecutor hsPool;
private HandshakeManager handshakeManager;
private boolean firstHelloProcessed;
private PortFeaturesUtil portFeaturesUtils;
+ private int conductorId;
+
+ private int ingressMaxQueueSize;
+
+
/**
* @param connectionAdapter
*/
public ConnectionConductorImpl(ConnectionAdapter connectionAdapter) {
+ this(connectionAdapter, INGRESS_QUEUE_MAX_SIZE);
+ }
+
+ /**
+ * @param connectionAdapter
+ * @param ingressMaxQueueSize ingress queue limit (blocking)
+ */
+ public ConnectionConductorImpl(ConnectionAdapter connectionAdapter, int ingressMaxQueueSize) {
this.connectionAdapter = connectionAdapter;
+ this.ingressMaxQueueSize = ingressMaxQueueSize;
conductorState = CONDUCTOR_STATE.HANDSHAKING;
- hsPool = Executors.newFixedThreadPool(1);
firstHelloProcessed = false;
handshakeManager = new HandshakeManagerImpl(connectionAdapter,
ConnectionConductor.versionOrder.get(0), ConnectionConductor.versionOrder);
@Override
public void init() {
+ int handshakeThreadLimit = 1;
+ hsPool = new ThreadPoolLoggingExecutor(handshakeThreadLimit , handshakeThreadLimit, 0L,
+ TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(),
+ "OFHandshake-"+conductorId);
+
connectionAdapter.setMessageListener(this);
connectionAdapter.setSystemListener(this);
connectionAdapter.setConnectionReadyListener(this);
+ queue = QueueKeeperFactory.createFairQueueKeeper(queueProcessor, ingressMaxQueueSize);
}
@Override
- public void setQueueKeeper(QueueKeeper<OfHeader, DataObject> queueKeeper) {
- this.queueKeeper = queueKeeper;
+ public void setQueueProcessor(QueueProcessor<OfHeader, DataObject> queueProcessor) {
+ this.queueProcessor = queueProcessor;
}
/**
@Override
public void onErrorMessage(ErrorMessage errorMessage) {
- queueKeeper.push(errorMessage, this);
+ enqueueMessage(errorMessage);
+ }
+
+
+ /**
+ * @param message
+ */
+ private void enqueueMessage(OfHeader message) {
+ enqueueMessage(message, QueueType.DEFAULT);
+ }
+
+ /**
+ * @param message
+ * @param queueType enqueue type
+ */
+ private void enqueueMessage(OfHeader message, QueueType queueType) {
+ queue.push(message, this, queueType);
}
@Override
public void onExperimenterMessage(ExperimenterMessage experimenterMessage) {
- queueKeeper.push(experimenterMessage, this);
+ enqueueMessage(experimenterMessage);
}
@Override
public void onFlowRemovedMessage(FlowRemovedMessage message) {
- queueKeeper.push(message, this);
+ enqueueMessage(message);
}
* then continue connection processing. if no common version found, just disconnect.
* 3. If HelloMessage version is not supported, send HelloMessage with lower supported version.
* 4. If Hello message received again with not supported version, just disconnect.
- *
- * TODO: Better to handle handshake into a maintainable innerclass which uses State-Pattern.
*/
@Override
- public synchronized void onHelloMessage(final HelloMessage hello) {
+ public void onHelloMessage(final HelloMessage hello) {
LOG.debug("processing HELLO.xid: {}", hello.getXid());
firstHelloProcessed = true;
checkState(CONDUCTOR_STATE.HANDSHAKING);
HandshakeStepWrapper handshakeStepWrapper = new HandshakeStepWrapper(
hello, handshakeManager, connectionAdapter);
- hsPool.execute(handshakeStepWrapper);
+ hsPool.submit(handshakeStepWrapper);
}
/**
@Override
public void onMultipartReplyMessage(MultipartReplyMessage message) {
- queueKeeper.push(message, this);
+ enqueueMessage(message);
}
@Override
public void onPacketInMessage(PacketInMessage message) {
- queueKeeper.push(message, this, QueueKeeper.QueueType.UNORDERED);
+ enqueueMessage(message, QueueKeeper.QueueType.UNORDERED);
}
@Override
public void onPortStatusMessage(PortStatusMessage message) {
processPortStatusMsg(message);
- queueKeeper.push(message, this);
+ enqueueMessage(message);
}
protected void processPortStatusMsg(PortStatus msg) {
Boolean portBandwidth = portFeaturesUtils.getPortBandwidth(msg);
if(portBandwidth == null) {
- LOG.warn("can't get bandwidth info from port: {}, aborting port update", msg.toString());
+ LOG.debug("can't get bandwidth info from port: {}, aborting port update", msg.toString());
} else {
this.getSessionContext().getPhysicalPorts().put(portNumber, msg);
this.getSessionContext().getPortsBandwidth().put(portNumber, portBandwidth);
}
}
- protected void deletePort(Port port) {
+ protected void deletePort(PortGrouping port) {
Long portNumber = port.getPortNo();
this.getSessionContext().getPhysicalPorts().remove(portNumber);
disconnect();
OFSessionUtil.getSessionManager().invalidateOnDisconnect(ConnectionConductorImpl.this);
} else {
- LOG.debug("first idle state occured");
+ LOG.debug("first idle state occured, sessionCtx={}|auxId={}", sessionContext, auxiliaryKey);
EchoInputBuilder builder = new EchoInputBuilder();
builder.setVersion(getVersion());
builder.setXid(getSessionContext().getNextXid());
}
/**
- * @param handshaking
+ * @param expectedState
*/
protected void checkState(CONDUCTOR_STATE expectedState) {
if (!conductorState.equals(expectedState)) {
@Override
public Future<Boolean> disconnect() {
- LOG.info("disconnecting: sessionCtx="+sessionContext+"|auxId="+auxiliaryKey);
+ LOG.trace("disconnecting: sessionCtx={}|auxId={}", sessionContext, auxiliaryKey);
Future<Boolean> result = null;
if (connectionAdapter.isAlive()) {
}
@Override
- public synchronized void onConnectionReady() {
+ public void onConnectionReady() {
LOG.debug("connection is ready-to-use");
if (! firstHelloProcessed) {
HandshakeStepWrapper handshakeStepWrapper = new HandshakeStepWrapper(
@Override
public void onHandshakeSuccessfull(GetFeaturesOutput featureOutput,
Short negotiatedVersion) {
+ postHandshakeBasic(featureOutput, negotiatedVersion);
+
+ // post-handshake actions
+ if(version == OFConstants.OFP_VERSION_1_3){
+ setDefaultConfig();
+ requestPorts();
+ requestGroupFeatures();
+ requestMeterFeatures();
+ } else if (version == OFConstants.OFP_VERSION_1_0) {
+ // Because the GetFeaturesOutput contains information about the port
+ // in OF1.0 (that we would otherwise get from the PortDesc) we have to pass
+ // it up for parsing to convert into a NodeConnectorUpdate
+ enqueueMessage(featureOutput);
+ }
+
+ requestDesc();
+ }
+
+ /**
+ * used by tests
+ * @param featureOutput
+ * @param negotiatedVersion
+ */
+ protected void postHandshakeBasic(GetFeaturesOutput featureOutput,
+ Short negotiatedVersion) {
version = negotiatedVersion;
conductorState = CONDUCTOR_STATE.WORKING;
OFSessionUtil.registerSession(this, featureOutput, negotiatedVersion);
- requestDesc();
- requestPorts();
- requestGroupFeatures();
- requestMeterFeatures();
+ hsPool.shutdown();
+ hsPool.purge();
+ }
+
+ private void setDefaultConfig(){
+ SetConfigInputBuilder builder = new SetConfigInputBuilder();
+ builder.setVersion(getVersion());
+ builder.setXid(getSessionContext().getNextXid());
+ SwitchConfigFlag flag = SwitchConfigFlag.FRAGNORMAL;
+ builder.setFlags(flag);
+ builder.setMissSendLen(OFConstants.OFPCML_NO_BUFFER);
+ getConnectionAdapter().setConfig(builder.build());
}
/*
* Send an OFPMP_DESC request message to the switch
*/
-
private void requestDesc() {
MultipartRequestInputBuilder builder = new MultipartRequestInputBuilder();
builder.setType(MultipartType.OFPMPDESC);
hsPool.shutdownNow();
LOG.debug("pool is terminated: {}", hsPool.isTerminated());
}
+
+ @Override
+ public void setId(int conductorId) {
+ this.conductorId = conductorId;
+ }
}
Code Review / openflowplugin.git / blobdiff