X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Fimpl%2FRpcProviderRegistryImpl.java;h=0949d3d7612dfb34a1f8890329653af7efebc35e;hp=c61ec4926a65f58f31fd03657162b0af70b23c0e;hb=3591817114661bb7971d6d355186ff1b39636fcd;hpb=ffdd886888129a77a08aa77826a7f092cf9e3392 diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RpcProviderRegistryImpl.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RpcProviderRegistryImpl.java index c61ec4926a..0949d3d761 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RpcProviderRegistryImpl.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RpcProviderRegistryImpl.java @@ -8,18 +8,21 @@ package org.opendaylight.controller.sal.binding.impl; import static com.google.common.base.Preconditions.checkState; - +import com.google.common.base.Preconditions; +import com.google.common.base.Throwables; +import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; - +import com.google.common.util.concurrent.UncheckedExecutionException; import java.util.EventListener; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import java.util.WeakHashMap; - +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.atomic.AtomicBoolean; import org.opendaylight.controller.md.sal.common.api.routing.RouteChange; import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener; import org.opendaylight.controller.md.sal.common.api.routing.RouteChangePublisher; @@ -29,12 +32,13 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistr import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier; import org.opendaylight.controller.sal.binding.api.rpc.RpcRouter; +import org.opendaylight.controller.sal.binding.codegen.RpcIsNotRoutedException; import org.opendaylight.controller.sal.binding.codegen.RuntimeCodeGenerator; import org.opendaylight.controller.sal.binding.codegen.RuntimeCodeHelper; import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder; import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.concepts.util.ListenerRegistry; +import org.opendaylight.yangtools.util.ListenerRegistry; import org.opendaylight.yangtools.yang.binding.BaseIdentity; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.RpcService; @@ -56,7 +60,9 @@ public class RpcProviderRegistryImpl implements RpcProviderRegistry, RouteChange } }); - private final Map, RpcRouter> rpcRouters = new WeakHashMap<>(); + private final Cache, RpcRouter> rpcRouters = CacheBuilder.newBuilder().weakKeys() + .build(); + private final ListenerRegistry>> routeChangeListeners = ListenerRegistry .create(); private final ListenerRegistry routerInstantiationListener = ListenerRegistry.create(); @@ -83,14 +89,21 @@ public class RpcProviderRegistryImpl implements RpcProviderRegistry, RouteChange } @Override - public final RpcRegistration addRpcImplementation(final Class type, final T implementation) - throws IllegalStateException { - @SuppressWarnings("unchecked") - RpcRouter potentialRouter = (RpcRouter) rpcRouters.get(type); - if (potentialRouter != null) { + public final RpcRegistration addRpcImplementation(final Class type, final T implementation) { + + // FIXME: This should be well documented - addRpcImplementation for + // routed RPCs + try { + // Note: If RPC is really global, expected count of registrations + // of this method is really low. + RpcRouter potentialRouter = getRpcRouter(type); checkState(potentialRouter.getDefaultService() == null, - "Default service for routed RPC already registered."); + "Default service for routed RPC already registered."); return potentialRouter.registerDefaultService(implementation); + } catch (RpcIsNotRoutedException e) { + // NOOP - we could safely continue, since RPC is not routed + // so we fallback to global routing. + LOG.debug("RPC is not routed. Using global registration.",e); } T publicProxy = getRpcService(type); RpcService currentDelegate = RuntimeCodeHelper.getDelegate(publicProxy); @@ -107,28 +120,37 @@ public class RpcProviderRegistryImpl implements RpcProviderRegistry, RouteChange return (T) publicProxies.getUnchecked(type); } - @SuppressWarnings({ "unchecked", "rawtypes" }) + public RpcRouter getRpcRouter(final Class type) { - RpcRouter potentialRouter = rpcRouters.get(type); - if (potentialRouter != null) { - return (RpcRouter) potentialRouter; - } - synchronized (this) { - /** - * Potential Router could be instantiated by other thread while we - * were waiting for the lock. - */ - potentialRouter = rpcRouters.get(type); - if (potentialRouter != null) { - return (RpcRouter) potentialRouter; + try { + final AtomicBoolean created = new AtomicBoolean(false); + @SuppressWarnings( "unchecked") + // LoadingCache is unsuitable for RpcRouter since we need to distinguish + // first creation of RPC Router, so that is why + // we are using normal cache with load API and shared AtomicBoolean + // for this call, which will be set to true if router was created. + RpcRouter router = (RpcRouter) rpcRouters.get(type,new Callable>() { + + @Override + public org.opendaylight.controller.sal.binding.api.rpc.RpcRouter call() { + RpcRouter router = rpcFactory.getRouterFor(type, name); + router.registerRouteChangeListener(new RouteChangeForwarder(type)); + LOG.debug("Registering router {} as global implementation of {} in {}", router, type.getSimpleName(), this); + RuntimeCodeHelper.setDelegate(getRpcService(type), router.getInvocationProxy()); + created.set(true); + return router; + } + }); + if(created.get()) { + notifyListenersRoutedCreated(router); } - RpcRouter router = rpcFactory.getRouterFor(type, name); - router.registerRouteChangeListener(new RouteChangeForwarder(type)); - LOG.debug("Registering router {} as global implementation of {} in {}", router, type.getSimpleName(), this); - RuntimeCodeHelper.setDelegate(getRpcService(type), router.getInvocationProxy()); - rpcRouters.put(type, router); - notifyListenersRoutedCreated(router); return router; + } catch (ExecutionException | UncheckedExecutionException e) { + // We rethrow Runtime Exceptions which were wrapped by + // Execution Exceptions + // otherwise we throw IllegalStateException with original + Throwables.propagateIfPossible(e.getCause()); + throw new IllegalStateException("Could not load RPC Router for "+type.getName(),e); } } @@ -159,7 +181,7 @@ public class RpcProviderRegistryImpl implements RpcProviderRegistry, RouteChange final RouterInstantiationListener listener) { ListenerRegistration reg = routerInstantiationListener.register(listener); try { - for (RpcRouter router : rpcRouters.values()) { + for (RpcRouter router : rpcRouters.asMap().values()) { listener.onRpcRouterCreated(router); } } catch (Exception e) { @@ -197,11 +219,10 @@ public class RpcProviderRegistryImpl implements RpcProviderRegistry, RouteChange } - private class RouteChangeForwarder implements RouteChangeListener, InstanceIdentifier> { - + private final class RouteChangeForwarder implements RouteChangeListener, InstanceIdentifier> { private final Class type; - public RouteChangeForwarder(final Class type) { + RouteChangeForwarder(final Class type) { this.type = type; } @@ -225,21 +246,20 @@ public class RpcProviderRegistryImpl implements RpcProviderRegistry, RouteChange try { listener.getInstance().onRouteChange(toPublish); } catch (Exception e) { - e.printStackTrace(); + LOG.error("Unhandled exception during invoking listener",listener.getInstance(),e); } } } } - public static class RpcProxyRegistration extends AbstractObjectRegistration implements RpcRegistration { - + private static final class RpcProxyRegistration extends AbstractObjectRegistration implements RpcRegistration { + private final RpcProviderRegistryImpl registry; private final Class serviceType; - private RpcProviderRegistryImpl registry; - public RpcProxyRegistration(final Class type, final T service, final RpcProviderRegistryImpl registry) { + RpcProxyRegistration(final Class type, final T service, final RpcProviderRegistryImpl registry) { super(service); + this.registry = Preconditions.checkNotNull(registry); this.serviceType = type; - this.registry = registry; } @Override @@ -249,13 +269,10 @@ public class RpcProviderRegistryImpl implements RpcProviderRegistry, RouteChange @Override protected void removeRegistration() { - if (registry != null) { - T publicProxy = registry.getRpcService(serviceType); - RpcService currentDelegate = RuntimeCodeHelper.getDelegate(publicProxy); - if (currentDelegate == getInstance()) { - RuntimeCodeHelper.setDelegate(publicProxy, null); - } - registry = null; + T publicProxy = registry.getRpcService(serviceType); + RpcService currentDelegate = RuntimeCodeHelper.getDelegate(publicProxy); + if (currentDelegate == getInstance()) { + RuntimeCodeHelper.setDelegate(publicProxy, null); } } }