Updated Branches: refs/heads/trunk af4799b52 -> 08e334649
Enable tcp keepalive on incoming connections. Patch by marcuse, reviewed by jbellis for CASSANDRA-4053 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3448ca57 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3448ca57 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3448ca57 Branch: refs/heads/trunk Commit: 3448ca57f3714521b5b7fc88fac43e31d0adcafa Parents: 5817aa9 Author: Marcus Eriksson <marc...@spotify.com> Authored: Tue Sep 24 09:55:00 2013 +0200 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Tue Sep 24 09:56:48 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- src/java/org/apache/cassandra/net/MessagingService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3448ca57/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 43bb25c..1bdb6a8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,7 +7,7 @@ Merged from 1.2: * Do not open non-ssl storage port if encryption option is all (CASSANDRA-3916) * Move batchlog replay to its own executor (CASSANDRA-6079) * Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057) - + * Enable tcp keepalive on incoming connections (CASSANDRA-4053) 2.0.1 * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3448ca57/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index 792d657..33e3bfb 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -820,6 +820,7 @@ public final class MessagingService implements MessagingServiceMBean Socket socket = server.accept(); if (authenticate(socket)) { + socket.setKeepAlive(true); // determine the connection type to decide whether to buffer DataInputStream in = new DataInputStream(socket.getInputStream()); MessagingService.validateMagic(in.readInt());
