X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-persister-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fpersist%2Fimpl%2FConfigPersisterNotificationHandler.java;h=e319d2cb679260718c9eade75234b9996170007c;hp=25d2ad6abd09943278d28262a7184649a0688f4f;hb=c5b0b028392646507133df0af5efcee547763b6d;hpb=b2d4575c4425e3b3d5aeaf1190e01e5d5a5286aa diff --git a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java index 25d2ad6abd..e319d2cb67 100644 --- a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java +++ b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPersisterNotificationHandler.java @@ -8,26 +8,12 @@ package org.opendaylight.controller.netconf.persist.impl; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.Sets; -import io.netty.channel.EventLoopGroup; -import io.netty.channel.nio.NioEventLoopGroup; import org.opendaylight.controller.config.persist.api.Persister; -import org.opendaylight.controller.netconf.api.NetconfMessage; import org.opendaylight.controller.netconf.api.jmx.CommitJMXNotification; import org.opendaylight.controller.netconf.api.jmx.DefaultCommitOperationMXBean; import org.opendaylight.controller.netconf.api.jmx.NetconfJMXNotification; -import org.opendaylight.controller.netconf.client.NetconfClient; -import org.opendaylight.controller.netconf.client.NetconfClientDispatcher; -import org.opendaylight.controller.netconf.util.xml.XmlElement; -import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants; -import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.SAXException; import javax.annotation.concurrent.ThreadSafe; import javax.management.InstanceNotFoundException; @@ -35,165 +21,63 @@ import javax.management.MBeanServerConnection; import javax.management.Notification; import javax.management.NotificationListener; import javax.management.ObjectName; -import javax.net.ssl.SSLContext; import java.io.Closeable; import java.io.IOException; -import java.io.InputStream; -import java.net.InetSocketAddress; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; +import java.util.regex.Pattern; /** - * Responsible for listening for notifications from netconf containing latest + * Responsible for listening for notifications from netconf (via JMX) containing latest * committed configuration that should be persisted, and also for loading last * configuration. */ @ThreadSafe -public class ConfigPersisterNotificationHandler implements NotificationListener, Closeable { +public class ConfigPersisterNotificationHandler implements Closeable { private static final Logger logger = LoggerFactory.getLogger(ConfigPersisterNotificationHandler.class); + private final MBeanServerConnection mBeanServerConnection; + private final ConfigPersisterNotificationListener listener; - private final InetSocketAddress address; - private final EventLoopGroup nettyThreadgroup; - private NetconfClientDispatcher netconfClientDispatcher; - private NetconfClient netconfClient; + public ConfigPersisterNotificationHandler(MBeanServerConnection mBeanServerConnection, + Persister persisterAggregator, Pattern ignoredMissingCapabilityRegex) { + this.mBeanServerConnection = mBeanServerConnection; + listener = new ConfigPersisterNotificationListener(persisterAggregator, ignoredMissingCapabilityRegex); + registerAsJMXListener(mBeanServerConnection, listener); - private final Persister persister; - private final MBeanServerConnection mbeanServer; - private Long currentSessionId; - - private final ObjectName on = DefaultCommitOperationMXBean.objectName; - - public static final long DEFAULT_TIMEOUT = 40000L; - private final long timeout; - - public ConfigPersisterNotificationHandler(Persister persister, InetSocketAddress address, - MBeanServerConnection mbeanServer) { - this(persister, address, mbeanServer, DEFAULT_TIMEOUT); - } - - public ConfigPersisterNotificationHandler(Persister persister, InetSocketAddress address, - MBeanServerConnection mbeanServer, long timeout) { - this.persister = persister; - this.address = address; - this.mbeanServer = mbeanServer; - this.timeout = timeout; - - this.nettyThreadgroup = new NioEventLoopGroup(); - } - - public void init() throws InterruptedException { - Optional maybeConfig = loadLastConfig(); - - if (maybeConfig.isPresent()) { - logger.debug("Last config found {}", persister); - - registerToNetconf(maybeConfig.get().getCapabilities()); - - final String configSnapshot = maybeConfig.get().getConfigSnapshot(); - try { - pushLastConfig(XmlUtil.readXmlToElement(configSnapshot)); - } catch (SAXException | IOException e) { - throw new IllegalStateException("Unable to load last config", e); - } - - } else { - // this ensures that netconf is initialized, this is first - // connection - // this means we can register as listener for commit - registerToNetconf(Collections.emptySet()); - - logger.info("No last config provided by backend storage {}", persister); - } - registerAsJMXListener(); } - private synchronized long registerToNetconf(Set expectedCaps) throws InterruptedException { - - Set currentCapabilities = Sets.newHashSet(); - - // TODO think about moving capability subset check to netconf client - // could be utilized by integration tests - - long pollingStart = System.currentTimeMillis(); - int delay = 5000; - - int attempt = 0; - - while (true) { - attempt++; - - netconfClientDispatcher = new NetconfClientDispatcher(Optional.absent(), nettyThreadgroup, nettyThreadgroup); - try { - netconfClient = new NetconfClient(this.toString(), address, delay, netconfClientDispatcher); - } catch (IllegalStateException e) { - logger.debug("Netconf {} was not initialized or is not stable, attempt {}", address, attempt, e); - netconfClientDispatcher.close(); - Thread.sleep(delay); - continue; - } - currentCapabilities = netconfClient.getCapabilities(); - - if (isSubset(currentCapabilities, expectedCaps)) { - logger.debug("Hello from netconf stable with {} capabilities", currentCapabilities); - currentSessionId = netconfClient.getSessionId(); - logger.info("Session id received from netconf server: {}", currentSessionId); - return currentSessionId; - } - - if (System.currentTimeMillis() > pollingStart + timeout) { - break; - } - - logger.debug("Polling hello from netconf, attempt {}, capabilities {}", attempt, currentCapabilities); - - closeClientAndDispatcher(netconfClient, netconfClientDispatcher); - - Thread.sleep(delay); + private static void registerAsJMXListener(MBeanServerConnection mBeanServerConnection, ConfigPersisterNotificationListener listener) { + logger.trace("Called registerAsJMXListener"); + try { + mBeanServerConnection.addNotificationListener(DefaultCommitOperationMXBean.objectName, listener, null, null); + } catch (InstanceNotFoundException | IOException e) { + throw new RuntimeException("Cannot register as JMX listener to netconf", e); } - Set allNotFound = new HashSet<>(expectedCaps); - allNotFound.removeAll(currentCapabilities); - logger.error("Netconf server did not provide required capabilities. Expected but not found: {}, all expected {}, current {}", - allNotFound, expectedCaps ,currentCapabilities); - throw new RuntimeException("Netconf server did not provide required capabilities. Expected but not found:" + allNotFound); - } - private static void closeClientAndDispatcher(Closeable client, Closeable dispatcher) { - Exception fromClient = null; + @Override + public synchronized void close() { + // unregister from JMX + ObjectName on = DefaultCommitOperationMXBean.objectName; try { - client.close(); - } catch (Exception e) { - fromClient = e; - } finally { - try { - dispatcher.close(); - } catch (Exception e) { - if (fromClient != null) { - e.addSuppressed(fromClient); - } - - throw new RuntimeException("Error closing temporary client ", e); + if (mBeanServerConnection.isRegistered(on)) { + mBeanServerConnection.removeNotificationListener(on, listener); } + } catch (Exception e) { + logger.warn("Unable to unregister {} as listener for {}", listener, on, e); } } +} - private boolean isSubset(Set currentCapabilities, Set expectedCaps) { - for (String exCap : expectedCaps) { - if (currentCapabilities.contains(exCap) == false) - return false; - } - return true; - } +class ConfigPersisterNotificationListener implements NotificationListener { + private static final Logger logger = LoggerFactory.getLogger(ConfigPersisterNotificationListener.class); - private void registerAsJMXListener() { - try { - mbeanServer.addNotificationListener(on, this, null, null); - } catch (InstanceNotFoundException | IOException e) { - throw new RuntimeException("Cannot register as JMX listener to netconf", e); - } + private final Persister persisterAggregator; + private final Pattern ignoredMissingCapabilityRegex; + + ConfigPersisterNotificationListener(Persister persisterAggregator, Pattern ignoredMissingCapabilityRegex) { + this.persisterAggregator = persisterAggregator; + this.ignoredMissingCapabilityRegex = ignoredMissingCapabilityRegex; } @Override @@ -204,12 +88,13 @@ public class ConfigPersisterNotificationHandler implements NotificationListener, // Socket should not be closed at this point // Activator unregisters this as JMX listener before close is called - logger.debug("Received notification {}", notification); + logger.trace("Received notification {}", notification); if (notification instanceof CommitJMXNotification) { try { handleAfterCommitNotification((CommitJMXNotification) notification); - } catch (Exception e) { - // TODO: notificationBroadcast support logs only DEBUG + } catch (Throwable e) { + // log exceptions from notification Handler here since + // notificationBroadcastSupport logs only DEBUG level logger.warn("Exception occured during notification handling: ", e); throw e; } @@ -219,144 +104,11 @@ public class ConfigPersisterNotificationHandler implements NotificationListener, private void handleAfterCommitNotification(final CommitJMXNotification notification) { try { - final XmlElement configElement = XmlElement.fromDomElement(notification.getConfigSnapshot()); - persister.persistConfig(new Persister.ConfigSnapshotHolder() { - @Override - public String getConfigSnapshot() { - return XmlUtil.toString(configElement.getDomElement()); - } - - @Override - public Set getCapabilities() { - return notification.getCapabilities(); - } - }); - logger.debug("Configuration persisted successfully"); + persisterAggregator.persistConfig(new CapabilityStrippingConfigSnapshotHolder(notification.getConfigSnapshot(), + notification.getCapabilities(), ignoredMissingCapabilityRegex)); + logger.trace("Configuration persisted successfully"); } catch (IOException e) { throw new RuntimeException("Unable to persist configuration snapshot", e); } } - - private Optional loadLastConfig() { - Optional maybeConfigElement; - try { - maybeConfigElement = persister.loadLastConfig(); - } catch (IOException e) { - throw new RuntimeException("Unable to load configuration", e); - } - return maybeConfigElement; - } - - private synchronized void pushLastConfig(Element persistedConfig) { - StringBuilder response = new StringBuilder("editConfig response = {"); - - Element configElement = persistedConfig; - NetconfMessage message = createEditConfigMessage(configElement, "/netconfOp/editConfig.xml"); - NetconfMessage responseMessage = netconfClient.sendMessage(message); - - XmlElement element = XmlElement.fromDomDocument(responseMessage.getDocument()); - Preconditions.checkState(element.getName().equals(XmlNetconfConstants.RPC_REPLY_KEY)); - element = element.getOnlyChildElement(); - - checkIsOk(element, responseMessage); - response.append(XmlUtil.toString(responseMessage.getDocument())); - response.append("}"); - responseMessage = netconfClient.sendMessage(getNetconfMessageFromResource("/netconfOp/commit.xml")); - - element = XmlElement.fromDomDocument(responseMessage.getDocument()); - Preconditions.checkState(element.getName().equals(XmlNetconfConstants.RPC_REPLY_KEY)); - element = element.getOnlyChildElement(); - - checkIsOk(element, responseMessage); - response.append("commit response = {"); - response.append(XmlUtil.toString(responseMessage.getDocument())); - response.append("}"); - logger.debug("Last configuration loaded successfully"); - } - - private void checkIsOk(XmlElement element, NetconfMessage responseMessage) { - if (element.getName().equals(XmlNetconfConstants.OK)) { - return; - } else { - if (element.getName().equals(XmlNetconfConstants.RPC_ERROR)) { - logger.warn("Can not load last configuration, operation failed"); - throw new IllegalStateException("Can not load last configuration, operation failed: " - + XmlUtil.toString(responseMessage.getDocument())); - } - logger.warn("Can not load last configuration. Operation failed."); - throw new IllegalStateException("Can not load last configuration. Operation failed: " - + XmlUtil.toString(responseMessage.getDocument())); - } - } - - private NetconfMessage createEditConfigMessage(Element dataElement, String editConfigResourcename) { - try (InputStream stream = getClass().getResourceAsStream(editConfigResourcename)) { - Preconditions.checkNotNull(stream, "Unable to load resource " + editConfigResourcename); - - Document doc = XmlUtil.readXmlToDocument(stream); - - doc.getDocumentElement(); - XmlElement editConfigElement = XmlElement.fromDomDocument(doc).getOnlyChildElement(); - XmlElement configWrapper = editConfigElement.getOnlyChildElement(XmlNetconfConstants.CONFIG_KEY); - editConfigElement.getDomElement().removeChild(configWrapper.getDomElement()); - for (XmlElement el : XmlElement.fromDomElement(dataElement).getChildElements()) { - configWrapper.appendChild((Element) doc.importNode(el.getDomElement(), true)); - } - editConfigElement.appendChild(configWrapper.getDomElement()); - return new NetconfMessage(doc); - } catch (IOException | SAXException e) { - throw new RuntimeException("Unable to parse message from resources " + editConfigResourcename, e); - } - } - - private NetconfMessage getNetconfMessageFromResource(String resource) { - try (InputStream stream = getClass().getResourceAsStream(resource)) { - Preconditions.checkNotNull(stream, "Unable to load resource " + resource); - return new NetconfMessage(XmlUtil.readXmlToDocument(stream)); - } catch (SAXException | IOException e) { - throw new RuntimeException("Unable to parse message from resources " + resource, e); - } - } - - @Override - public synchronized void close() { - // TODO persister is received from constructor, should not be closed - // here - try { - persister.close(); - } catch (Exception e) { - logger.warn("Unable to close config persister {}", persister, e); - } - - if (netconfClient != null) { - try { - netconfClient.close(); - } catch (Exception e) { - logger.warn("Unable to close connection to netconf {}", netconfClient, e); - } - } - - if (netconfClientDispatcher != null) { - try { - netconfClientDispatcher.close(); - } catch (Exception e) { - logger.warn("Unable to close connection to netconf {}", netconfClientDispatcher, e); - } - } - - try { - nettyThreadgroup.shutdownGracefully(); - } catch (Exception e) { - logger.warn("Unable to close netconf client thread group {}", netconfClientDispatcher, e); - } - - // unregister from JMX - try { - if (mbeanServer.isRegistered(on)) { - mbeanServer.removeNotificationListener(on, this); - } - } catch (Exception e) { - logger.warn("Unable to unregister {} as listener for {}", this, on, e); - } - } -} +} \ No newline at end of file