Author: wang
Date: Thu Oct 31 20:57:22 2013
New Revision: 1537639
URL: http://svn.apache.org/r1537639
Log:
HADOOP-9898. Set SO_KEEPALIVE on all our sockets. Contributed by Todd Lipcon.
Modified:
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Modified:
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1537639&r1=1537638&r2=1537639&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/CHANGES.txt
Thu Oct 31 20:57:22 2013
@@ -38,6 +38,8 @@ Release 2.2.1 - UNRELEASED
HADOOP-10072. TestNfsExports#testMultiMatchers fails due to
non-deterministic
timing around cache expiry check. (cnauroth)
+ HADOOP-9898. Set SO_KEEPALIVE on all our sockets. (todd via wang)
+
Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1537639&r1=1537638&r2=1537639&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
Thu Oct 31 20:57:22 2013
@@ -522,6 +522,7 @@ public class Client {
try {
this.socket = socketFactory.createSocket();
this.socket.setTcpNoDelay(tcpNoDelay);
+ this.socket.setKeepAlive(true);
/*
* Bind the socket to the host specified in the principal name of the
Modified:
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1537639&r1=1537638&r2=1537639&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++
hadoop/common/branches/branch-2.2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Thu Oct 31 20:57:22 2013
@@ -759,6 +759,7 @@ public abstract class Server {
channel.configureBlocking(false);
channel.socket().setTcpNoDelay(tcpNoDelay);
+ channel.socket().setKeepAlive(true);
Reader reader = getReader();
try {
