Author: szetszwo
Date: Tue May 29 21:18:59 2012
New Revision: 1343998
URL: http://svn.apache.org/viewvc?rev=1343998&view=rev
Log:
svn merge -c 1343992 from branch-1 for HADOOP-5464.
Modified:
hadoop/common/branches/branch-1.1/ (props changed)
hadoop/common/branches/branch-1.1/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
Propchange: hadoop/common/branches/branch-1.1/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1:r1343992
Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1343998&r1=1343997&r2=1343998&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Tue May 29 21:18:59 2012
@@ -241,6 +241,9 @@ Release 1.1.0 - unreleased
HDFS-3453. HDFS 1.x client is not interoperable with pre 1.x server.
(Kihwal Lee via suresh)
+
+ HADOOP-5464. DFSClient did not treat write timeout of 0 properly.
+ (Raghu Angadi and Brandon Li via szetszwo)
Release 1.0.3 - 2012.05.07
Propchange: hadoop/common/branches/branch-1.1/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1343992
Modified:
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=1343998&r1=1343997&r2=1343998&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
(original)
+++
hadoop/common/branches/branch-1.1/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
Tue May 29 21:18:59 2012
@@ -3527,14 +3527,16 @@ public class DFSClient implements FSCons
final String dnName = nodes[0].getName(connectToDnViaHostname);
InetSocketAddress target = NetUtils.createSocketAddr(dnName);
s = socketFactory.createSocket();
- timeoutValue = 3000 * nodes.length + socketTimeout;
+ timeoutValue = (socketTimeout > 0) ?
+ (3000 * nodes.length + socketTimeout) : 0;
LOG.debug("Connecting to " + dnName);
NetUtils.connect(s, target, getRandomLocalInterfaceAddr(),
timeoutValue);
s.setSoTimeout(timeoutValue);
s.setSendBufferSize(DEFAULT_DATA_SOCKET_SIZE);
LOG.debug("Send buf size " + s.getSendBufferSize());
- long writeTimeout = HdfsConstants.WRITE_TIMEOUT_EXTENSION *
nodes.length +
- datanodeWriteTimeout;
+ long writeTimeout = (datanodeWriteTimeout > 0) ?
+ (HdfsConstants.WRITE_TIMEOUT_EXTENSION * nodes.length +
+ datanodeWriteTimeout) : 0;
//
// Xmit header info to datanode
