From c7e472e8c1eb5739866e8c93957738676cc744bc Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Tue, 6 May 2014 22:41:20 -0500
Subject: [PATCH]  Set keepalive on MessagingService connections patch by
 Jianwei Zhang; reviewed by jbellis for CASSANDRA-7170

---
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/net/MessagingService.java | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1c6171e202..8c1d234faa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.17
+ * Set keepalive on MessagingService connections (CASSANDRA-7170)
  * Add Cloudstack snitch (CASSANDRA-7147)
  * Update system.peers correctly when relocating tokens (CASSANDRA-7126)
  * Add Google Compute Engine snitch (CASSANDRA-7132)
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index 5e4a1173ae..41553b1f49 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -904,9 +904,14 @@ public final class MessagingService implements MessagingServiceMBean
                 {
                     Socket socket = server.accept();
                     if (authenticate(socket))
+                    {
+                        socket.setKeepAlive(true);
                         new IncomingTcpConnection(socket).start();
+                    }
                     else
+                    {
                         socket.close();
+                    }
                 }
                 catch (AsynchronousCloseException e)
                 {