X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fosgi%2FConfigManagerActivator.java;h=7966b8983aab814ca310be6d660b5f8e1ba4fc1c;hp=90131fee98ab0877d77e132d69f4752360e0c356;hb=f77ea78c351d1c3604287e8444aae6943f70042f;hpb=f5ea38e63e89fd1a804e21a5c538d99522900837 diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java index 90131fee98..7966b8983a 100644 --- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java +++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/ConfigManagerActivator.java @@ -7,107 +7,106 @@ */ package org.opendaylight.controller.config.manager.impl.osgi; +import static org.opendaylight.controller.config.manager.impl.util.OsgiRegistrationUtil.registerService; +import static org.opendaylight.controller.config.manager.impl.util.OsgiRegistrationUtil.wrap; import java.lang.management.ManagementFactory; -import java.util.Collection; - +import java.util.Arrays; +import java.util.List; import javax.management.InstanceAlreadyExistsException; import javax.management.MBeanServer; - +import org.opendaylight.controller.config.api.ConfigRegistry; import org.opendaylight.controller.config.manager.impl.ConfigRegistryImpl; import org.opendaylight.controller.config.manager.impl.jmx.ConfigRegistryJMXRegistrator; +import org.opendaylight.controller.config.manager.impl.jmx.JMXNotifierConfigRegistry; +import org.opendaylight.controller.config.manager.impl.osgi.mapping.BindingContextProvider; import org.opendaylight.controller.config.manager.impl.osgi.mapping.ModuleInfoBundleTracker; -import org.opendaylight.controller.config.manager.impl.osgi.mapping.RuntimeGeneratedMappingServiceActivator; +import org.opendaylight.controller.config.manager.impl.osgi.mapping.RefreshingSCPModuleInfoRegistry; +import org.opendaylight.controller.config.manager.impl.util.OsgiRegistrationUtil; import org.opendaylight.controller.config.spi.ModuleFactory; -import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -import org.opendaylight.yangtools.yang.data.impl.codec.CodecRegistry; +import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadingStrategy; +import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class ConfigManagerActivator implements BundleActivator { - private static final Logger logger = LoggerFactory.getLogger(ConfigManagerActivator.class); - private ExtensibleBundleTracker>> bundleTracker; - private ConfigRegistryImpl configRegistry; - private ConfigRegistryJMXRegistrator configRegistryJMXRegistrator; - private ServiceRegistration configRegistryServiceRegistration; + private static final Logger LOG = LoggerFactory.getLogger(ConfigManagerActivator.class); private final MBeanServer configMBeanServer = ManagementFactory.getPlatformMBeanServer(); - private RuntimeGeneratedMappingServiceActivator mappingServiceActivator; + private AutoCloseable autoCloseable; @Override - public void start(BundleContext context) { - - // track bundles containing YangModuleInfo - ModuleInfoBundleTracker moduleInfoBundleTracker = new ModuleInfoBundleTracker(); - mappingServiceActivator = new RuntimeGeneratedMappingServiceActivator(moduleInfoBundleTracker); - CodecRegistry codecRegistry = mappingServiceActivator.startRuntimeMappingService(context).getCodecRegistry(); - - // start config registry - BundleContextBackedModuleFactoriesResolver bundleContextBackedModuleFactoriesResolver = new BundleContextBackedModuleFactoriesResolver( - context); - configRegistry = new ConfigRegistryImpl(bundleContextBackedModuleFactoriesResolver, configMBeanServer, - codecRegistry); - - // track bundles containing factories - BlankTransactionServiceTracker blankTransactionServiceTracker = new BlankTransactionServiceTracker( - configRegistry); - ModuleFactoryBundleTracker moduleFactoryBundleTracker = new ModuleFactoryBundleTracker( - blankTransactionServiceTracker); - - // start extensible tracker - bundleTracker = new ExtensibleBundleTracker<>(context, moduleInfoBundleTracker, moduleFactoryBundleTracker); - bundleTracker.open(); - - // register config registry to OSGi - configRegistryServiceRegistration = context.registerService(ConfigRegistryImpl.class, configRegistry, null); - - // register config registry to jmx - configRegistryJMXRegistrator = new ConfigRegistryJMXRegistrator(configMBeanServer); + public void start(final BundleContext context) { try { - configRegistryJMXRegistrator.registerToJMX(configRegistry); - } catch (InstanceAlreadyExistsException e) { - throw new IllegalStateException("Config Registry was already registered to JMX", e); + ModuleInfoBackedContext moduleInfoBackedContext = ModuleInfoBackedContext.create();// the inner strategy is backed by thread context cl? + + BindingContextProvider bindingContextProvider = new BindingContextProvider(); + + RefreshingSCPModuleInfoRegistry moduleInfoRegistryWrapper = new RefreshingSCPModuleInfoRegistry( + moduleInfoBackedContext, moduleInfoBackedContext, moduleInfoBackedContext, moduleInfoBackedContext, bindingContextProvider, context); + + ModuleInfoBundleTracker moduleInfoBundleTracker = new ModuleInfoBundleTracker(moduleInfoRegistryWrapper); + + // start config registry + BundleContextBackedModuleFactoriesResolver bundleContextBackedModuleFactoriesResolver = new BundleContextBackedModuleFactoriesResolver( + context); + ConfigRegistryImpl configRegistry = new ConfigRegistryImpl(bundleContextBackedModuleFactoriesResolver, configMBeanServer, + bindingContextProvider); + + // track bundles containing factories + BlankTransactionServiceTracker blankTransactionServiceTracker = new BlankTransactionServiceTracker( + configRegistry); + ModuleFactoryBundleTracker primaryModuleFactoryBundleTracker = new ModuleFactoryBundleTracker( + blankTransactionServiceTracker); + + // start extensible tracker + ExtensibleBundleTracker bundleTracker = new ExtensibleBundleTracker<>(context, + primaryModuleFactoryBundleTracker, moduleInfoBundleTracker); + bundleTracker.open(); + + // Wrap config registry with JMX notification publishing adapter + final JMXNotifierConfigRegistry notifyingConfigRegistry = + new JMXNotifierConfigRegistry(configRegistry, configMBeanServer); + + // register config registry to OSGi + AutoCloseable clsReg = registerService(context, moduleInfoBackedContext, GeneratedClassLoadingStrategy.class); + AutoCloseable configRegReg = registerService(context, notifyingConfigRegistry, ConfigRegistry.class); + + // register config registry to jmx + ConfigRegistryJMXRegistrator configRegistryJMXRegistrator = new ConfigRegistryJMXRegistrator(configMBeanServer); + try { + configRegistryJMXRegistrator.registerToJMXNoNotifications(configRegistry); + } catch (InstanceAlreadyExistsException e) { + throw new IllegalStateException("Config Registry was already registered to JMX", e); + } + + // register config registry to jmx + final ConfigRegistryJMXRegistrator configRegistryJMXRegistratorWithNotifications = new ConfigRegistryJMXRegistrator(configMBeanServer); + try { + configRegistryJMXRegistrator.registerToJMX(notifyingConfigRegistry); + } catch (InstanceAlreadyExistsException e) { + throw new IllegalStateException("Config Registry was already registered to JMX", e); + } + + // TODO wire directly via moduleInfoBundleTracker + ServiceTracker serviceTracker = new ServiceTracker<>(context, ModuleFactory.class, + blankTransactionServiceTracker); + serviceTracker.open(); + + List list = Arrays.asList(bindingContextProvider, clsReg, configRegistry, wrap(bundleTracker), + configRegReg, configRegistryJMXRegistrator, configRegistryJMXRegistratorWithNotifications, wrap(serviceTracker), moduleInfoRegistryWrapper, notifyingConfigRegistry); + autoCloseable = OsgiRegistrationUtil.aggregate(list); + } catch(Exception e) { + LOG.warn("Error starting config manager", e); } - - ServiceTracker serviceTracker = new ServiceTracker<>(context, ModuleFactory.class, - blankTransactionServiceTracker); - serviceTracker.open(); } @Override - public void stop(BundleContext context) { - try { - configRegistry.close(); - } catch (Exception e) { - logger.warn("Exception while closing config registry", e); - } - try { - bundleTracker.close(); - } catch (Exception e) { - logger.warn("Exception while closing extender", e); - } - try { - configRegistryJMXRegistrator.close(); - } catch (Exception e) { - logger.warn( - "Exception while closing config registry jmx registrator", - e); - } - try { - configRegistryServiceRegistration.unregister(); - } catch (Exception e) { - logger.warn("Exception while unregistering config registry", e); - } - try { - mappingServiceActivator.close(); - } catch (Exception e) { - logger.warn("Exception while closing mapping service", e); - } + public void stop(final BundleContext context) throws Exception { + autoCloseable.close(); } }