import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
-import com.google.common.base.Verify;
import com.google.common.collect.Iterators;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import io.netty.util.HashedWheelTimer;
import io.netty.util.TimerTask;
import java.util.Collections;
import java.util.Iterator;
+import java.util.Objects;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
import javax.annotation.CheckForNull;
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.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueueHandlerRegistration;
import org.opendaylight.openflowplugin.api.openflow.OFPContext;
import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
+import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionStatus;
import org.opendaylight.openflowplugin.api.openflow.connection.OutboundQueueProvider;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
import org.opendaylight.openflowplugin.api.openflow.device.TranslatorLibrary;
import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceInitializationPhaseHandler;
import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceTerminationPhaseHandler;
-import org.opendaylight.openflowplugin.api.openflow.lifecycle.LifecycleConductor;
import org.opendaylight.openflowplugin.api.openflow.lifecycle.LifecycleService;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
import org.opendaylight.openflowplugin.extension.api.ExtensionConverterProviderKeeper;
import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider;
import org.opendaylight.openflowplugin.impl.connection.OutboundQueueProviderImpl;
import org.opendaylight.openflowplugin.impl.device.listener.OpenflowProtocolListenerFullImpl;
import org.opendaylight.openflowplugin.impl.lifecycle.LifecycleServiceImpl;
-import org.opendaylight.openflowplugin.impl.util.DeviceInitializationUtils;
import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodesBuilder;
private final long globalNotificationQuota;
private final boolean switchFeaturesMandatory;
private boolean isNotificationFlowRemovedOff;
-
+ private boolean skipTableFeatures;
private static final int SPY_RATE = 10;
private final DataBroker dataBroker;
private final long barrierIntervalNanos;
private final int barrierCountLimit;
+
private ExtensionConverterProvider extensionConverterProvider;
private ScheduledThreadPoolExecutor spyPool;
private final ClusterSingletonServiceProvider singletonServiceProvider;
-
- private final LifecycleConductor conductor;
+ private final NotificationPublishService notificationPublishService;
+ private final MessageSpy messageSpy;
+ private final HashedWheelTimer hashedWheelTimer;
public DeviceManagerImpl(@Nonnull final DataBroker dataBroker,
final long globalNotificationQuota,
final boolean switchFeaturesMandatory,
final long barrierInterval,
final int barrierCountLimit,
- final LifecycleConductor lifecycleConductor,
- boolean isNotificationFlowRemovedOff,
- final ConvertorExecutor convertorExecutor,
- final ClusterSingletonServiceProvider singletonServiceProvider) {
- this.switchFeaturesMandatory = switchFeaturesMandatory;
- this.globalNotificationQuota = globalNotificationQuota;
- this.isNotificationFlowRemovedOff = isNotificationFlowRemovedOff;
- this.dataBroker = Preconditions.checkNotNull(dataBroker);
- this.convertorExecutor = convertorExecutor;
+ final MessageSpy messageSpy,
+ final boolean isNotificationFlowRemovedOff,
+ final ClusterSingletonServiceProvider singletonServiceProvider,
+ final NotificationPublishService notificationPublishService,
+ final HashedWheelTimer hashedWheelTimer,
+ final ConvertorExecutor convertorExecutor,
+ final boolean skipTableFeatures) {
+
+ this.dataBroker = dataBroker;
+
/* merge empty nodes to oper DS to predict any problems with missing parent for Node */
final WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
-
final NodesBuilder nodesBuilder = new NodesBuilder();
nodesBuilder.setNode(Collections.<Node>emptyList());
tx.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Nodes.class), nodesBuilder.build());
throw new IllegalStateException(e);
}
+ this.switchFeaturesMandatory = switchFeaturesMandatory;
+ this.globalNotificationQuota = globalNotificationQuota;
+ this.isNotificationFlowRemovedOff = isNotificationFlowRemovedOff;
+ this.skipTableFeatures = skipTableFeatures;
+ this.convertorExecutor = convertorExecutor;
+ this.hashedWheelTimer = hashedWheelTimer;
this.barrierIntervalNanos = TimeUnit.MILLISECONDS.toNanos(barrierInterval);
this.barrierCountLimit = barrierCountLimit;
-
- this.conductor = lifecycleConductor;
- spyPool = new ScheduledThreadPoolExecutor(1);
+ this.spyPool = new ScheduledThreadPoolExecutor(1);
this.singletonServiceProvider = singletonServiceProvider;
+ this.notificationPublishService = notificationPublishService;
+ this.messageSpy = messageSpy;
}
}
@Override
- public boolean deviceConnected(@CheckForNull final ConnectionContext connectionContext) throws Exception {
+ public ConnectionStatus deviceConnected(@CheckForNull final ConnectionContext connectionContext) throws Exception {
Preconditions.checkArgument(connectionContext != null);
DeviceInfo deviceInfo = connectionContext.getDeviceInfo();
* If context already exist we are in state closing process (connection flapping) and we should not propagate connection close
*/
if (deviceContexts.containsKey(deviceInfo)) {
- LOG.warn("Rejecting connection from node which is already connected and there exist deviceContext for it: {}", connectionContext.getNodeId());
- return false;
+ DeviceContext deviceContext = deviceContexts.get(deviceInfo);
+ LOG.warn("Node {} already connected disconnecting device. Rejecting connection", deviceInfo.getLOGValue());
+ if (!deviceContext.getState().equals(OFPContext.CONTEXT_STATE.TERMINATION)) {
+ LOG.warn("Node {} context state not in TERMINATION state.",
+ connectionContext.getDeviceInfo().getLOGValue());
+ return ConnectionStatus.ALREADY_CONNECTED;
+ } else {
+ return ConnectionStatus.CLOSING;
+ }
}
LOG.info("ConnectionEvent: Device connected to controller, Device:{}, NodeId:{}",
connectionAdapter.registerOutboundQueueHandler(outboundQueueProvider, barrierCountLimit, barrierIntervalNanos);
connectionContext.setOutboundQueueHandleRegistration(outboundQueueHandlerRegistration);
- final DeviceContext deviceContext = new DeviceContextImpl(connectionContext,
+ final DeviceContext deviceContext = new DeviceContextImpl(
+ connectionContext,
dataBroker,
- conductor,
- outboundQueueProvider,
+ messageSpy,
translatorLibrary,
this,
- convertorExecutor);
+ convertorExecutor,
+ skipTableFeatures);
+
+ deviceContexts.put(deviceInfo, deviceContext);
final LifecycleService lifecycleService = new LifecycleServiceImpl();
lifecycleService.setDeviceContext(deviceContext);
+ deviceContext.putLifecycleServiceIntoTxChainManager(lifecycleService);
- Verify.verify(deviceContexts.putIfAbsent(deviceInfo, deviceContext) == null, "DeviceCtx still not closed.");
- lifecycleServices.putIfAbsent(deviceInfo, lifecycleService);
+ lifecycleServices.put(deviceInfo, lifecycleService);
deviceContext.setSwitchFeaturesMandatory(switchFeaturesMandatory);
((ExtensionConverterProviderKeeper) deviceContext).setExtensionConverterProvider(extensionConverterProvider);
- deviceContext.setNotificationPublishService(conductor.getNotificationPublishService());
+ deviceContext.setNotificationPublishService(notificationPublishService);
updatePacketInRateLimiters();
connectionAdapter.setMessageListener(messageListener);
deviceInitPhaseHandler.onDeviceContextLevelUp(connectionContext.getDeviceInfo(), lifecycleService);
- return true;
+ return ConnectionStatus.MAY_CONTINUE;
}
private void updatePacketInRateLimiters() {
if (freshNotificationLimit < 100) {
freshNotificationLimit = 100;
}
- LOG.debug("fresh notification limit = {}", freshNotificationLimit);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("fresh notification limit = {}", freshNotificationLimit);
+ }
for (final DeviceContext deviceContext : deviceContexts.values()) {
deviceContext.updatePacketInRateLimit(freshNotificationLimit);
}
deviceCtx.shuttingDownDataStoreTransactions();
}
- if (spyPool != null) {
- spyPool.shutdownNow();
- spyPool = null;
- }
+ Optional.ofNullable(spyPool).ifPresent(ScheduledThreadPoolExecutor::shutdownNow);
+ spyPool = null;
+
}
@Override
public void onDeviceContextLevelDown(final DeviceInfo deviceInfo) {
- LOG.debug("onDeviceContextClosed for Node {}", deviceInfo.getNodeId());
- deviceContexts.remove(deviceInfo);
- updatePacketInRateLimiters();
+
LifecycleService lifecycleService = lifecycleServices.remove(deviceInfo);
- try {
- lifecycleService.close();
- } catch (Exception e) {
- LOG.warn("Closing service for node {} was unsuccessful ", deviceInfo.getNodeId().getValue(), e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Lifecycle service removed for node {}", deviceInfo.getLOGValue());
}
+
+ updatePacketInRateLimiters();
+ if (Objects.nonNull(lifecycleService)) {
+ try {
+ lifecycleService.close();
+ LOG.debug("Lifecycle service successfully closed for node {}", deviceInfo.getLOGValue());
+ } catch (Exception e) {
+ LOG.warn("Closing lifecycle service for node {} was unsuccessful ", deviceInfo.getLOGValue(), e);
+ }
+ }
+
+ deviceContexts.remove(deviceInfo);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Device context removed for node {}", deviceInfo.getLOGValue());
+ }
+
}
@Override
public void initialize() {
- spyPool.scheduleAtFixedRate(conductor.getMessageIntelligenceAgency(), SPY_RATE, SPY_RATE, TimeUnit.SECONDS);
+ spyPool.scheduleAtFixedRate(messageSpy, SPY_RATE, SPY_RATE, TimeUnit.SECONDS);
}
@Override
final DeviceContext deviceCtx = this.deviceContexts.get(deviceInfo);
if (null == deviceCtx) {
- LOG.info("DeviceContext for Node {} was not found. Connection is terminated without OFP context suite.", deviceInfo.getNodeId());
+ LOG.info("DeviceContext for Node {} was not found. Connection is terminated without OFP context suite.", deviceInfo.getLOGValue());
return;
}
+ if (deviceCtx.getState().equals(OFPContext.CONTEXT_STATE.TERMINATION)) {
+ LOG.info("Device context for node {} is already is termination state, waiting for close all context", deviceInfo.getLOGValue());
+ return;
+ }
+
+ deviceCtx.setState(OFPContext.CONTEXT_STATE.TERMINATION);
+
if (!connectionContext.equals(deviceCtx.getPrimaryConnectionContext())) {
+ LOG.debug("Node {} disconnected, but not primary connection.", connectionContext.getDeviceInfo().getLOGValue());
/* Connection is not PrimaryConnection so try to remove from Auxiliary Connections */
deviceCtx.removeAuxiliaryConnectionContext(connectionContext);
- } else {
+ }
+ //TODO: Auxiliary connections supported ?
/* Device is disconnected and so we need to close TxManager */
- final ListenableFuture<Void> future = deviceCtx.shuttingDownDataStoreTransactions();
- Futures.addCallback(future, new FutureCallback<Void>() {
+ final ListenableFuture<Void> future = deviceCtx.shuttingDownDataStoreTransactions();
+ Futures.addCallback(future, new FutureCallback<Void>() {
- @Override
- public void onSuccess(final Void result) {
- LOG.debug("TxChainManager for device {} is closed successful.", deviceInfo.getNodeId());
- deviceTerminPhaseHandler.onDeviceContextLevelDown(deviceInfo);
- }
+ @Override
+ public void onSuccess(final Void result) {
+ LOG.debug("TxChainManager for device {} is closed successful.", deviceInfo.getLOGValue());
+ deviceTerminPhaseHandler.onDeviceContextLevelDown(deviceInfo);
+ }
- @Override
- public void onFailure(final Throwable t) {
- LOG.warn("TxChainManager for device {} failed by closing.", deviceInfo.getNodeId(), t);
- deviceTerminPhaseHandler.onDeviceContextLevelDown(deviceInfo);
- }
- });
- /* Add timer for Close TxManager because it could fain ind cluster without notification */
- final TimerTask timerTask = timeout -> {
- if (!future.isDone()) {
- LOG.info("Shutting down TxChain for node {} not completed during 10 sec. Continue anyway.", deviceInfo.getNodeId());
- future.cancel(false);
- }
- };
- conductor.newTimeout(timerTask, 10, TimeUnit.SECONDS);
- }
+ @Override
+ public void onFailure(final Throwable t) {
+ LOG.warn("TxChainManager for device {} failed by closing.", deviceInfo.getLOGValue());
+ LOG.trace("TxChainManager failed by closing. ", t);
+ deviceTerminPhaseHandler.onDeviceContextLevelDown(deviceInfo);
+ }
+ });
+ /* Add timer for Close TxManager because it could fain ind cluster without notification */
+ final TimerTask timerTask = timeout -> {
+ if (!future.isDone()) {
+ LOG.warn("Shutting down TxChain for node {} not completed during 10 sec. Continue anyway.", deviceInfo.getLOGValue());
+ future.cancel(false);
+ }
+ };
+ hashedWheelTimer.newTimeout(timerTask, 10, TimeUnit.SECONDS);
}
@VisibleForTesting
deviceContexts.put(deviceInfo, deviceContext);
}
- @Override
- public <T extends OFPContext> T gainContext(final DeviceInfo deviceInfo) {
- return (T) deviceContexts.get(deviceInfo);
- }
-
@Override
public void setIsNotificationFlowRemovedOff(boolean isNotificationFlowRemovedOff) {
this.isNotificationFlowRemovedOff = isNotificationFlowRemovedOff;
return this.isNotificationFlowRemovedOff;
}
+
+ @Override
+ public void setSkipTableFeatures(boolean skipTableFeaturesValue) {
+ skipTableFeatures = skipTableFeaturesValue;
+ }
+
}
Code Review / openflowplugin.git / blobdiff