X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-netty-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fnettyutil%2FAbstractNetconfSessionNegotiator.java;h=9e1edc337661fc808f1dc50e549b0bdeb3e6ae68;hp=1360a54d6fbaf2609067f1617337e8af76ec7852;hb=1e884647502a8d91f8a57bde8193c60b9bbcce0d;hpb=7343e5ed39a37cb10bb16d8b153c0e008c704673 diff --git a/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSessionNegotiator.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSessionNegotiator.java index 1360a54d6f..9e1edc3376 100644 --- a/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSessionNegotiator.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/AbstractNetconfSessionNegotiator.java @@ -11,6 +11,7 @@ package org.opendaylight.controller.netconf.nettyutil; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -26,6 +27,7 @@ import org.opendaylight.controller.netconf.api.NetconfDocumentedException; import org.opendaylight.controller.netconf.api.NetconfMessage; import org.opendaylight.controller.netconf.api.NetconfSessionListener; import org.opendaylight.controller.netconf.api.NetconfSessionPreferences; +import org.opendaylight.controller.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.controller.netconf.nettyutil.handler.FramingMechanismHandlerFactory; import org.opendaylight.controller.netconf.nettyutil.handler.NetconfChunkAggregator; import org.opendaylight.controller.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; @@ -33,7 +35,6 @@ import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToHelloMe import org.opendaylight.controller.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; import org.opendaylight.controller.netconf.util.messages.FramingMechanism; import org.opendaylight.controller.netconf.util.messages.NetconfHelloMessage; -import org.opendaylight.controller.netconf.util.xml.XmlUtil; import org.opendaylight.protocol.framework.AbstractSessionNegotiator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,9 +42,9 @@ import org.w3c.dom.Document; import org.w3c.dom.NodeList; public abstract class AbstractNetconfSessionNegotiator

, L extends NetconfSessionListener> -extends AbstractSessionNegotiator { + extends AbstractSessionNegotiator { - private static final Logger logger = LoggerFactory.getLogger(AbstractNetconfSessionNegotiator.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractNetconfSessionNegotiator.class); public static final String NAME_OF_EXCEPTION_HANDLER = "lastExceptionHandler"; @@ -65,8 +66,8 @@ extends AbstractSessionNegotiator { private final long connectionTimeoutMillis; // TODO shrink constructor - protected AbstractNetconfSessionNegotiator(P sessionPreferences, Promise promise, Channel channel, Timer timer, - L sessionListener, long connectionTimeoutMillis) { + protected AbstractNetconfSessionNegotiator(final P sessionPreferences, final Promise promise, final Channel channel, final Timer timer, + final L sessionListener, final long connectionTimeoutMillis) { super(promise, channel); this.sessionPreferences = sessionPreferences; this.promise = promise; @@ -82,9 +83,9 @@ extends AbstractSessionNegotiator { Future future = sslHandler.get().handshakeFuture(); future.addListener(new GenericFutureListener>() { @Override - public void operationComplete(Future future) { + public void operationComplete(final Future future) { Preconditions.checkState(future.isSuccess(), "Ssl handshake was not successful"); - logger.debug("Ssl handshake complete"); + LOG.debug("Ssl handshake complete"); start(); } }); @@ -93,7 +94,7 @@ extends AbstractSessionNegotiator { } } - private static Optional getSslHandler(Channel channel) { + private static Optional getSslHandler(final Channel channel) { final SslHandler sslHandler = channel.pipeline().get(SslHandler.class); return sslHandler == null ? Optional. absent() : Optional.of(sslHandler); } @@ -104,7 +105,7 @@ extends AbstractSessionNegotiator { private void start() { final NetconfMessage helloMessage = this.sessionPreferences.getHelloMessage(); - logger.debug("Session negotiation started with hello message {}", XmlUtil.toString(helloMessage.getDocument())); + LOG.debug("Session negotiation started with hello message {} on channel {}", helloMessage, channel); channel.pipeline().addLast(NAME_OF_EXCEPTION_HANDLER, new ExceptionHandlingInboundChannelHandler()); @@ -120,17 +121,25 @@ extends AbstractSessionNegotiator { synchronized (this) { if (state != State.ESTABLISHED) { - logger.debug("Connection timeout after {}, session is in state {}", timeout, state); + LOG.debug("Connection timeout after {}, session is in state {}", timeout, state); // Do not fail negotiation if promise is done or canceled // It would result in setting result of the promise second time and that throws exception if (isPromiseFinished() == false) { - // FIXME BUG-1365 calling "negotiation failed" closes the channel, but the channel does not get closed if data is still being transferred - // Loopback connection initiation might negotiationFailed(new IllegalStateException("Session was not established after " + timeout)); + changeState(State.FAILED); + + channel.closeFuture().addListener(new GenericFutureListener() { + @Override + public void operationComplete(final ChannelFuture future) throws Exception { + if(future.isSuccess()) { + LOG.debug("Channel {} closed: success", future.channel()); + } else { + LOG.warn("Channel {} closed: fail", future.channel()); + } + } + }); } - - changeState(State.FAILED); } else if(channel.isOpen()) { channel.pipeline().remove(NAME_OF_EXCEPTION_HANDLER); } @@ -150,7 +159,7 @@ extends AbstractSessionNegotiator { } } - protected final S getSessionForHelloMessage(NetconfHelloMessage netconfMessage) throws NetconfDocumentedException { + protected final S getSessionForHelloMessage(final NetconfHelloMessage netconfMessage) throws NetconfDocumentedException { Preconditions.checkNotNull(netconfMessage, "netconfMessage"); final Document doc = netconfMessage.getDocument(); @@ -173,7 +182,7 @@ extends AbstractSessionNegotiator { new NetconfChunkAggregator()); } - private boolean shouldUseChunkFraming(Document doc) { + private boolean shouldUseChunkFraming(final Document doc) { return containsBase11Capability(doc) && containsBase11Capability(sessionPreferences.getHelloMessage().getDocument()); } @@ -207,30 +216,30 @@ extends AbstractSessionNegotiator { replaceChannelHandler(channel, AbstractChannelInitializer.NETCONF_MESSAGE_ENCODER, new NetconfMessageToXMLEncoder()); } - private static ChannelHandler replaceChannelHandler(Channel channel, String handlerKey, ChannelHandler decoder) { + private static ChannelHandler replaceChannelHandler(final Channel channel, final String handlerKey, final ChannelHandler decoder) { return channel.pipeline().replace(handlerKey, handlerKey, decoder); } protected abstract S getSession(L sessionListener, Channel channel, NetconfHelloMessage message) throws NetconfDocumentedException; private synchronized void changeState(final State newState) { - logger.debug("Changing state from : {} to : {}", state, newState); - Preconditions.checkState(isStateChangePermitted(state, newState), "Cannot change state from %s to %s", state, - newState); + LOG.debug("Changing state from : {} to : {} for channel: {}", state, newState, channel); + Preconditions.checkState(isStateChangePermitted(state, newState), "Cannot change state from %s to %s for chanel %s", state, + newState, channel); this.state = newState; } private boolean containsBase11Capability(final Document doc) { - final NodeList nList = doc.getElementsByTagName("capability"); + final NodeList nList = doc.getElementsByTagName(XmlNetconfConstants.CAPABILITY); for (int i = 0; i < nList.getLength(); i++) { - if (nList.item(i).getTextContent().contains("base:1.1")) { + if (nList.item(i).getTextContent().contains(XmlNetconfConstants.URN_IETF_PARAMS_NETCONF_BASE_1_1)) { return true; } } return false; } - private static boolean isStateChangePermitted(State state, State newState) { + private static boolean isStateChangePermitted(final State state, final State newState) { if (state == State.IDLE && newState == State.OPEN_WAIT) { return true; } @@ -240,7 +249,7 @@ extends AbstractSessionNegotiator { if (state == State.OPEN_WAIT && newState == State.FAILED) { return true; } - logger.debug("Transition from {} to {} is not allowed", state, newState); + LOG.debug("Transition from {} to {} is not allowed", state, newState); return false; } @@ -249,8 +258,8 @@ extends AbstractSessionNegotiator { */ private final class ExceptionHandlingInboundChannelHandler extends ChannelInboundHandlerAdapter { @Override - public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - logger.warn("An exception occurred during negotiation with {}", channel.remoteAddress(), cause); + public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) { + LOG.warn("An exception occurred during negotiation with {}", channel.remoteAddress(), cause); cancelTimeout(); negotiationFailed(cause); changeState(State.FAILED);