From cfd8647d0f20c08761f908be1f5b718c1c372498 Mon Sep 17 00:00:00 2001 From: Colin McCabe Date: Wed, 28 May 2014 17:44:14 +0000 Subject: [PATCH] HDFS-6448. BlockReaderLocalLegacy should set socket timeout based on conf.socketTimeout (liangxie via cmccabe) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598079 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/BlockReaderLocalLegacy.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 78c1d370f6..8e89d51477 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -601,6 +601,9 @@ Release 2.5.0 - UNRELEASED HDFS-6442. Fix TestEditLogAutoroll and TestStandbyCheckpoints failure caused by port conficts. (Zesheng Wu via Arpit Agarwal) + HDFS-6448. BlockReaderLocalLegacy should set socket timeout based on + conf.socketTimeout (liangxie via cmccabe) + Release 2.4.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocalLegacy.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocalLegacy.java index ddd25366e0..c68e548099 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocalLegacy.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocalLegacy.java @@ -187,7 +187,7 @@ static BlockReaderLocalLegacy newBlockReader(DFSClient.Conf conf, userGroupInformation = UserGroupInformation.getCurrentUser(); } pathinfo = getBlockPathInfo(userGroupInformation, blk, node, - configuration, conf.hdfsTimeout, token, + configuration, conf.socketTimeout, token, conf.connectToDnViaHostname); }