Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -c 1485861 Merging from trunk to branch-2 to fix HDFS-4807. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485863 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2013-05-23 21:37:32 +00:00
parent 7ba49c56aa
commit 3f9b3d49a3
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -2426,6 +2426,9 @@ Release 0.23.8 - UNRELEASED
HDFS-3875. Issue handling checksum errors in write pipeline. (kihwal)
HDFS-4807. createSocketForPipeline() should not include timeout extension
on connect. (Cristina L. Abad via kihwal)
Release 0.23.7 - UNRELEASED
INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
View File

@ -1293,7 +1293,7 @@ public class DFSOutputStream extends FSOutputSummer implements Syncable {
final InetSocketAddress isa = NetUtils.createSocketAddr(dnAddr);
final Socket sock = client.socketFactory.createSocket();
final int timeout = client.getDatanodeReadTimeout(length);
NetUtils.connect(sock, isa, client.getRandomLocalInterfaceAddr(), timeout);
NetUtils.connect(sock, isa, client.getRandomLocalInterfaceAddr(), client.getConf().socketTimeout);
sock.setSoTimeout(timeout);
sock.setSendBufferSize(HdfsConstants.DEFAULT_DATA_SOCKET_SIZE);
if(DFSClient.LOG.isDebugEnabled()) {