From 962d3eef6f172bc8bd66c242eda3250dbda39284 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 26 May 2014 09:56:15 +0200 Subject: [PATCH] BUG-1070: allow for URL registration failing As part of the error reporting effor, the API contract will change, such that the URLs can get parsed during registration, potentially throwing a checked exception. This adds the preparatory groundwork and optimized the codepath, as it's called repeatedly during controller startup. Change-Id: I7c5d97c7be6cc488f8b61a99d8e27804ce24e523 Signed-off-by: Robert Varga --- ...GlobalBundleScanningSchemaServiceImpl.java | 81 ++++++++++--------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java index dab8fd5cd1..076fca6f10 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java @@ -10,7 +10,10 @@ package org.opendaylight.controller.sal.dom.broker; import static com.google.common.base.Preconditions.checkState; import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; import java.util.Enumeration; +import java.util.List; import org.opendaylight.controller.sal.core.api.model.SchemaService; import org.opendaylight.controller.sal.dom.broker.impl.SchemaContextProvider; @@ -33,28 +36,22 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Optional; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSet.Builder; +import com.google.common.collect.ImmutableList; public class GlobalBundleScanningSchemaServiceImpl implements // - SchemaContextProvider, // - SchemaService, // - ServiceTrackerCustomizer, // - AutoCloseable { - private static final Logger logger = LoggerFactory.getLogger(GlobalBundleScanningSchemaServiceImpl.class); - - private ListenerRegistry listeners; - - private BundleContext context; - private final BundleScanner scanner = new BundleScanner(); - - private BundleTracker>> bundleTracker; +SchemaContextProvider, // +SchemaService, // +ServiceTrackerCustomizer, // +AutoCloseable { + private static final Logger LOG = LoggerFactory.getLogger(GlobalBundleScanningSchemaServiceImpl.class); private final URLSchemaContextResolver contextResolver = new URLSchemaContextResolver(); - + private final BundleScanner scanner = new BundleScanner(); private ServiceTracker listenerTracker; - + private BundleTracker>> bundleTracker; + private ListenerRegistry listeners; private boolean starting = true; + private BundleContext context; public ListenerRegistry getListeners() { return listeners; @@ -79,8 +76,8 @@ public class GlobalBundleScanningSchemaServiceImpl implements // } listenerTracker = new ServiceTracker<>(context, SchemaServiceListener.class, GlobalBundleScanningSchemaServiceImpl.this); - bundleTracker = new BundleTracker>>(context, BundleEvent.RESOLVED - | BundleEvent.UNRESOLVED, scanner); + bundleTracker = new BundleTracker>>(context, BundleEvent.RESOLVED + | BundleEvent.UNRESOLVED, scanner); bundleTracker.open(); listenerTracker.open(); starting = false; @@ -139,7 +136,7 @@ public class GlobalBundleScanningSchemaServiceImpl implements // try { listener.getInstance().onGlobalContextUpdated(snapshot); } catch (Exception e) { - logger.error("Exception occured during invoking listener", e); + LOG.error("Exception occured during invoking listener", e); } } if (services != null) { @@ -148,37 +145,47 @@ public class GlobalBundleScanningSchemaServiceImpl implements // try { listener.onGlobalContextUpdated(snapshot); } catch (Exception e) { - logger.error("Exception occured during invoking listener", e); + LOG.error("Exception occured during invoking listener {}", listener, e); } } } } - private class BundleScanner implements BundleTrackerCustomizer>> { + private class BundleScanner implements BundleTrackerCustomizer>> { @Override - public ImmutableSet> addingBundle(final Bundle bundle, final BundleEvent event) { + public Iterable> addingBundle(final Bundle bundle, final BundleEvent event) { if (bundle.getBundleId() == 0) { - return ImmutableSet.of(); + return Collections.emptyList(); } - Enumeration enumeration = bundle.findEntries("META-INF/yang", "*.yang", false); - Builder> builder = ImmutableSet.> builder(); - while (enumeration != null && enumeration.hasMoreElements()) { - Registration reg = contextResolver.registerSource(enumeration.nextElement()); - builder.add(reg); + final Enumeration enumeration = bundle.findEntries("META-INF/yang", "*.yang", false); + if (enumeration == null) { + return Collections.emptyList(); } - ImmutableSet> urls = builder.build(); - if(urls.isEmpty()) { - return urls; + + final List> urls = new ArrayList<>(); + while (enumeration.hasMoreElements()) { + final URL u = enumeration.nextElement(); + try { + urls.add(contextResolver.registerSource(u)); + LOG.debug("Registered {}", u); + } catch (Exception e) { + LOG.warn("Failed to register {}, ignoring it", e); + } } - tryToUpdateSchemaContext(); - return urls; + + if (!urls.isEmpty()) { + LOG.debug("Loaded {} new URLs, rebuilding schema context", urls.size()); + tryToUpdateSchemaContext(); + } + + return ImmutableList.copyOf(urls); } @Override - public void modifiedBundle(final Bundle bundle, final BundleEvent event, final ImmutableSet> object) { - logger.debug("Modified bundle {} {} {}", bundle, event, object); + public void modifiedBundle(final Bundle bundle, final BundleEvent event, final Iterable> object) { + LOG.debug("Modified bundle {} {} {}", bundle, event, object); } /** @@ -188,12 +195,12 @@ public class GlobalBundleScanningSchemaServiceImpl implements // */ @Override - public synchronized void removedBundle(final Bundle bundle, final BundleEvent event, final ImmutableSet> urls) { + public synchronized void removedBundle(final Bundle bundle, final BundleEvent event, final Iterable> urls) { for (Registration url : urls) { try { url.close(); } catch (Exception e) { - e.printStackTrace(); + LOG.warn("Failed do unregister URL {}, proceeding", url, e); } } tryToUpdateSchemaContext(); -- 2.36.6