You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2013/10/12 00:04:18 UTC
svn commit: r1531444 - in /zookeeper/trunk: CHANGES.txt ivy.xml
src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
Author: phunt
Date: Fri Oct 11 22:04:17 2013
New Revision: 1531444
URL: http://svn.apache.org/r1531444
Log:
ZOOKEEPER-1715. Upgrade netty version (Sean Bridges via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/ivy.xml
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1531444&r1=1531443&r2=1531444&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Oct 11 22:04:17 2013
@@ -647,6 +647,8 @@ IMPROVEMENTS:
ZOOKEEPER-1627. Add org.apache.zookeeper.common to exported packages
in OSGi MANIFEST (Arnoud Glimmerveen via phunt)
+ ZOOKEEPER-1715. Upgrade netty version (Sean Bridges via phunt)
+
headers
Release 3.4.0 -
Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1531444&r1=1531443&r2=1531444&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Fri Oct 11 22:04:17 2013
@@ -48,7 +48,7 @@
<dependency org="log4j" name="log4j" rev="1.2.16" transitive="false" conf="default"/>
<dependency org="jline" name="jline" rev="2.11" transitive="false" conf="optional->default"/>
- <dependency org="org.jboss.netty" name="netty" conf="default" rev="3.2.5.Final">
+ <dependency org="io.netty" name="netty" conf="default" rev="3.7.0.Final">
<artifact name="netty" type="jar" conf="default"/>
</dependency>
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java?rev=1531444&r1=1531443&r2=1531444&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java Fri Oct 11 22:04:17 2013
@@ -155,9 +155,13 @@ public class NettyServerCnxn extends Ser
ResumeMessageEvent(Channel channel) {
this.channel = channel;
}
+ @Override
public Object getMessage() {return null;}
+ @Override
public SocketAddress getRemoteAddress() {return null;}
+ @Override
public Channel getChannel() {return channel;}
+ @Override
public ChannelFuture getFuture() {return null;}
};
@@ -739,7 +743,7 @@ public class NettyServerCnxn extends Ser
zks.processPacket(this, bb);
if (zks.shouldThrottle(outstandingCount.incrementAndGet())) {
- disableRecv();
+ disableRecvNoWait();
}
} else {
LOG.debug("got conn req request from "
@@ -803,13 +807,17 @@ public class NettyServerCnxn extends Ser
@Override
public void disableRecv() {
+ disableRecvNoWait().awaitUninterruptibly();
+ }
+
+ private ChannelFuture disableRecvNoWait() {
throttled = true;
if (LOG.isDebugEnabled()) {
LOG.debug("Throttling - disabling recv " + this);
}
- channel.setReadable(false).awaitUninterruptibly();
+ return channel.setReadable(false);
}
-
+
@Override
public long getOutstandingRequests() {
return outstandingCount.longValue();
@@ -832,6 +840,7 @@ public class NettyServerCnxn extends Ser
/** Send close connection packet to the client.
*/
+ @Override
public void sendCloseSession() {
sendBuffer(ServerCnxnFactory.closeConn);
}