BUG-2400 : Added forgotten MAX_MSG_PER_READ option to BGP.

Change-Id: I690f2043a4c8a4d4ee9c48bf64c8841b1a704b16
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
(cherry picked from commit 0138d06f4c7ead1a472f846e4721df97fce15f3c)

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
index f08dc21c3416d4deab989efe9b8d8b3cd2f3a66f..7d924de27cf7fbcbb9e9b1100cbc9fcd9c8d6bdf 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPDispatcherImpl.java
@@ -10,13 +10,12 @@ package org.opendaylight.protocol.bgp.rib.impl;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.Promise;
-
 import java.net.InetSocketAddress;
-
 import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher;
 import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
@@ -128,6 +127,8 @@ public final class BGPDispatcherImpl extends AbstractDispatcher<BGPSessionImpl,
             }
             b.channelFactory(this.cf);
             b.option(MD5ChannelOption.TCP_MD5SIG, this.keys);
+            // Make sure we are doing round-robin processing
+            b.option(ChannelOption.MAX_MESSAGES_PER_READ, 1);
         }
     }
 
@@ -139,6 +140,8 @@ public final class BGPDispatcherImpl extends AbstractDispatcher<BGPSessionImpl,
             }
             b.channelFactory(this.scf);
             b.option(MD5ChannelOption.TCP_MD5SIG, this.keys);
+            // Make sure we are doing round-robin processing
+            b.childOption(ChannelOption.MAX_MESSAGES_PER_READ, 1);
         }
     }