HDFS-5806. balancer should set SoTimeout to avoid indefinite hangs. Contributed by Nathan Roberts

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1572228 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -11,8 +11,12 @@ Release 0.23.11 - UNRELEASED
   OPTIMIZATIONS
     
   BUG FIXES
+
     HDFS-5881. Fix skip() of the short-circuit local reader(legacy). (kihwal)
 
+    HDFS-5806. balancer should set SoTimeout to avoid indefinite hangs (Nathan
+    Roberts via jlowe)
+
 Release 0.23.10 - 2013-12-09
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java

@@ -307,6 +307,7 @@ public class Balancer {
         sock.connect(NetUtils.createSocketAddr(
             target.datanode.getName()), HdfsServerConstants.READ_TIMEOUT);
         sock.setKeepAlive(true);
+        sock.setSoTimeout(HdfsServerConstants.READ_TIMEOUT);
         out = new DataOutputStream( new BufferedOutputStream(
             sock.getOutputStream(), HdfsConstants.IO_FILE_BUFFER_SIZE));
         sendRequest(out);