You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/06/12 16:47:27 UTC
[10/13] git commit: Enabled keepalive for native protocol
Enabled keepalive for native protocol
Patch by brandonwilliams, reviewed by Sankalp Kohli for CASSANDRA-7380
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b48a17bf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b48a17bf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b48a17bf
Branch: refs/heads/cassandra-2.0
Commit: b48a17bfbb033d30ed0fd7d66d83129dbcbcf1fa
Parents: ca14da4
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jun 12 09:30:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jun 12 09:30:29 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 2 +-
src/java/org/apache/cassandra/transport/Server.java | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b48a17bf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f4f7fc4..94e2c5a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@
* Fix infinite loop on exception while streaming (CASSANDRA-7330)
* Reference sstables before populating key cache (CASSANDRA-7234)
Merged from 1.2:
+ * Enable keepalive for native protocol (CASSANDRA-7380)
* Check internal addresses for seeds (CASSANDRA-6523)
* Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354)
* Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b48a17bf/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 2de6753..ef8194e 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -336,7 +336,7 @@ rpc_address: localhost
# port for Thrift to listen for clients on
rpc_port: 9160
-# enable or disable keepalive on rpc connections
+# enable or disable keepalive on rpc/native connections
rpc_keepalive: true
# Cassandra provides two out-of-the-box options for the RPC Server:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b48a17bf/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 e16c681..f095776 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -138,6 +138,7 @@ public class Server implements CassandraDaemon.Server
ServerBootstrap bootstrap = new ServerBootstrap(factory);
bootstrap.setOption("child.tcpNoDelay", true);
+ bootstrap.setOption("child.keepAlive", DatabaseDescriptor.getRpcKeepAlive());
// Set up the event pipeline factory.
final EncryptionOptions.ClientEncryptionOptions clientEnc = DatabaseDescriptor.getClientEncryptionOptions();