Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 0249363e8 -> 1bae25ace


Set SO_LINGER to 0 for netty


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1bae25ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bae25ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bae25ac

Branch: refs/heads/cassandra-2.1
Commit: 1bae25ace7cd25487aa5cff83447069cd80d3e42
Parents: 0249363
Author: Jake Luciani <[email protected]>
Authored: Thu Oct 9 17:16:17 2014 -0400
Committer: Jake Luciani <[email protected]>
Committed: Thu Oct 9 17:16:17 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/transport/Server.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bae25ac/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Server.java 
b/src/java/org/apache/cassandra/transport/Server.java
index 92cd6e1..8af6ee8 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -160,6 +160,7 @@ public class Server implements CassandraDaemon.Server
                                     .group(workerGroup)
                                     .channel(hasEpoll ? 
EpollServerSocketChannel.class : NioServerSocketChannel.class)
                                     .childOption(ChannelOption.TCP_NODELAY, 
true)
+                                    .childOption(ChannelOption.SO_LINGER, 0)
                                     .childOption(ChannelOption.SO_KEEPALIVE, 
DatabaseDescriptor.getRpcKeepAlive())
                                     .childOption(ChannelOption.ALLOCATOR, 
CBUtil.allocator)
                                     
.childOption(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 32 * 1024)

Reply via email to