X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fimpl%2Frpc%2FRpcContextImpl.java;h=1a8cb845f1452b8760ae60369c48f0bf7b4e0fe8;hb=dc442e042a48d75da43720866f17631fe4c5f524;hp=b373bf93db35c3b868cef95d7faf3a802e8fa82d;hpb=bbf47715c938b4c40e7a6389872b07fd29b6638a;p=openflowplugin.git diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java index b373bf93db..1a8cb845f1 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/rpc/RpcContextImpl.java @@ -7,37 +7,58 @@ */ package org.opendaylight.openflowplugin.impl.rpc; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import java.util.Collection; -import java.util.HashSet; +import com.google.common.collect.Iterators; +import java.util.Iterator; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Semaphore; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext; +import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; +import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo; import org.opendaylight.openflowplugin.api.openflow.device.RequestContext; -import org.opendaylight.openflowplugin.api.openflow.rpc.ItemLifeCycleSource; +import org.opendaylight.openflowplugin.api.openflow.device.XidSequencer; import org.opendaylight.openflowplugin.api.openflow.rpc.RpcContext; import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeContext; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.opendaylight.yangtools.yang.binding.RpcService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RpcContextImpl implements RpcContext { +class RpcContextImpl implements RpcContext { private static final Logger LOG = LoggerFactory.getLogger(RpcContextImpl.class); private final RpcProviderRegistry rpcProviderRegistry; - private final DeviceContext deviceContext; private final MessageSpy messageSpy; private final Semaphore tracker; + private final XidSequencer xidSequencer; + private boolean isStatisticsRpcEnabled; // TODO: add private Sal salBroker - private final Collection> rpcRegistrations = new HashSet<>(); + private final ConcurrentMap, RoutedRpcRegistration> rpcRegistrations = new ConcurrentHashMap<>(); + private final KeyedInstanceIdentifier nodeInstanceIdentifier; + private CONTEXT_STATE state; + private final DeviceInfo deviceInfo; + + RpcContextImpl(final DeviceInfo deviceInfo, + final RpcProviderRegistry rpcProviderRegistry, + final XidSequencer xidSequencer, + final MessageSpy messageSpy, + final int maxRequests, + final KeyedInstanceIdentifier nodeInstanceIdentifier) { + this.xidSequencer = Preconditions.checkNotNull(xidSequencer); + this.messageSpy = Preconditions.checkNotNull(messageSpy); + this.rpcProviderRegistry = Preconditions.checkNotNull(rpcProviderRegistry); + this.nodeInstanceIdentifier = nodeInstanceIdentifier; - public RpcContextImpl(final MessageSpy messageSpy, final RpcProviderRegistry rpcProviderRegistry, final DeviceContext deviceContext, final int maxRequests) { - this.messageSpy = messageSpy; - this.rpcProviderRegistry = rpcProviderRegistry; - this.deviceContext = Preconditions.checkNotNull(deviceContext); tracker = new Semaphore(maxRequests, true); + setState(CONTEXT_STATE.WORKING); + this.deviceInfo = deviceInfo; } /** @@ -47,17 +68,22 @@ public class RpcContextImpl implements RpcContext { @Override public void registerRpcServiceImplementation(final Class serviceClass, final S serviceInstance) { - final RoutedRpcRegistration routedRpcReg = rpcProviderRegistry.addRoutedRpcImplementation(serviceClass, serviceInstance); - routedRpcReg.registerPath(NodeContext.class, deviceContext.getDeviceState().getNodeInstanceIdentifier()); - rpcRegistrations.add(routedRpcReg); - LOG.debug("Registration of service {} for device {}.", serviceClass, deviceContext.getDeviceState().getNodeInstanceIdentifier()); - - if (serviceInstance instanceof ItemLifeCycleSource) { - // TODO: collect registration for selective unregistering in case of tearing down only one rpc - deviceContext.getItemLifeCycleSourceRegistry().registerLifeCycleSource((ItemLifeCycleSource) serviceInstance); + LOG.trace("Try to register service {} for device {}.", serviceClass, nodeInstanceIdentifier); + if (! rpcRegistrations.containsKey(serviceClass)) { + final RoutedRpcRegistration routedRpcReg = rpcProviderRegistry.addRoutedRpcImplementation(serviceClass, serviceInstance); + routedRpcReg.registerPath(NodeContext.class, nodeInstanceIdentifier); + rpcRegistrations.put(serviceClass, routedRpcReg); + LOG.debug("Registration of service {} for device {}.", serviceClass, nodeInstanceIdentifier); } } + @Override + public S lookupRpcService(final Class serviceClass) { + RoutedRpcRegistration registration = rpcRegistrations.get(serviceClass); + final RpcService rpcService = registration.getInstance(); + return (S) rpcService; + } + /** * Unregisters all services. * @@ -65,11 +91,20 @@ public class RpcContextImpl implements RpcContext { */ @Override public void close() { - for (final RoutedRpcRegistration rpcRegistration : rpcRegistrations) { - rpcRegistration.unregisterPath(NodeContext.class, deviceContext.getDeviceState().getNodeInstanceIdentifier()); - rpcRegistration.close(); - LOG.debug("Closing RPC Registration of service {} for device {}.", rpcRegistration.getServiceType(), - deviceContext.getDeviceState().getNodeInstanceIdentifier()); + if (CONTEXT_STATE.TERMINATION.equals(getState())){ + if (LOG.isDebugEnabled()) { + LOG.debug("RpcContext is already in TERMINATION state."); + } + } else { + setState(CONTEXT_STATE.TERMINATION); + for (final Iterator, RoutedRpcRegistration>> iterator = Iterators + .consumingIterator(rpcRegistrations.entrySet().iterator()); iterator.hasNext(); ) { + final RoutedRpcRegistration rpcRegistration = iterator.next().getValue(); + rpcRegistration.unregisterPath(NodeContext.class, nodeInstanceIdentifier); + rpcRegistration.close(); + LOG.debug("Closing RPC Registration of service {} for device {}.", rpcRegistration.getServiceType(), + nodeInstanceIdentifier); + } } } @@ -78,15 +113,71 @@ public class RpcContextImpl implements RpcContext { if (!tracker.tryAcquire()) { LOG.trace("Device queue {} at capacity", this); return null; + } else { + LOG.trace("Acquired semaphore for {}, available permits:{} ", nodeInstanceIdentifier.getKey().getId(), tracker.availablePermits()); + } + + final Long xid = xidSequencer.reserveXidForDeviceMessage(); + if (xid == null) { + LOG.warn("Xid cannot be reserved for new RequestContext, node:{}", nodeInstanceIdentifier.getKey().getId()); + tracker.release(); + return null; } - return new AbstractRequestContext(deviceContext.getReservedXid()) { + return new AbstractRequestContext(xid) { @Override public void close() { tracker.release(); - LOG.trace("Removed request context with xid {}", getXid().getValue()); + final long xid = getXid().getValue(); + LOG.trace("Removed request context with xid {}", xid); messageSpy.spyMessage(RpcContextImpl.class, MessageSpy.STATISTIC_GROUP.REQUEST_STACK_FREED); } }; } + + @Override + public void unregisterRpcServiceImplementation(final Class serviceClass) { + LOG.trace("Try to unregister serviceClass {} for Node {}", serviceClass, nodeInstanceIdentifier.getKey().getId()); + final RoutedRpcRegistration rpcRegistration = rpcRegistrations.remove(serviceClass); + if (rpcRegistration != null) { + rpcRegistration.unregisterPath(NodeContext.class, nodeInstanceIdentifier); + rpcRegistration.close(); + LOG.debug("Unregistration serviceClass {} for Node {}", serviceClass, nodeInstanceIdentifier.getKey().getId()); + } + } + + @VisibleForTesting + boolean isEmptyRpcRegistrations() { + return this.rpcRegistrations.isEmpty(); + } + + @Override + public void setStatisticsRpcEnabled(boolean isStatisticsRpcEnabled) { + this.isStatisticsRpcEnabled = isStatisticsRpcEnabled; + } + + @Override + public boolean isStatisticsRpcEnabled() { + return isStatisticsRpcEnabled; + } + + @Override + public CONTEXT_STATE getState() { + return this.state; + } + + @Override + public void setState(CONTEXT_STATE state) { + this.state = state; + } + + @Override + public ServiceGroupIdentifier getServiceIdentifier() { + return this.deviceInfo.getServiceIdentifier(); + } + + @Override + public DeviceInfo getDeviceInfo() { + return this.deviceInfo; + } }