svn commit: r1053213 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/net/OutboundTcpConnection.java

[jbellis]

Author: jbellis
Date: Mon Dec 27 22:45:32 2010
New Revision: 1053213

URL: http://svn.apache.org/viewvc?rev=1053213&view=rev
Log:
enable keepalive on intra-cluster sockets
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-1766

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/OutboundTcpConnection.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=1053213&r1=1053212&r2=1053213&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Mon Dec 27 22:45:32 2010
@@ -28,6 +28,7 @@
  * Re-cache hot keys post-compaction without hitting disk (CASSANDRA-1878)
  * manage read repair in coordinator instead of data source, to
    provide latency information to dynamic snitch (CASSANDRA-1873)
+ * enable keepalive on intra-cluster sockets (CASSANDRA-1766)
 
 
 0.6.8

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/OutboundTcpConnection.java?rev=1053213&r1=1053212&r2=1053213&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
 (original)
+++ 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
 Mon Dec 27 22:45:32 2010
@@ -148,6 +148,7 @@ public class OutboundTcpConnection exten
             {
                 // zero means 'bind on any available port.'
                 socket = new Socket(endpoint, 
DatabaseDescriptor.getStoragePort(), FBUtilities.getLocalAddress(), 0);
+                socket.setKeepAlive(true);
                 socket.setTcpNoDelay(true);
                 output = new DataOutputStream(socket.getOutputStream());
                 return true;