Repository: hadoop Updated Branches: refs/heads/branch-2 366465959 -> c9c5b982b
HDFS-6754. TestNamenodeCapacityReport.testXceiverCount may sometimes fail due to lack of retry. Contributed by Mit Desai. (cherry picked from commit 3f25d916d5539917092e2f52a8c2df2cfd647c3c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c9c5b982 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c9c5b982 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c9c5b982 Branch: refs/heads/branch-2 Commit: c9c5b982b7bf95aaf6e6c0c691deabe45caf6295 Parents: 3664659 Author: Kihwal Lee <kih...@apache.org> Authored: Wed Oct 1 09:58:22 2014 -0500 Committer: Kihwal Lee <kih...@apache.org> Committed: Wed Oct 1 09:58:22 2014 -0500 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c9c5b982/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 97e0190..ff832ad 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -528,6 +528,9 @@ Release 2.6.0 - UNRELEASED HDFS-4227. Document dfs.namenode.resource.* (Daisuke Kobayashi via aw) + HDFS-6754. TestNamenodeCapacityReport may sometimes fail due to lack of + retry. (Mit Desai via kihwal) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HDFS-6387. HDFS CLI admin tool for creating & deleting an http://git-wip-us.apache.org/repos/asf/hadoop/blob/c9c5b982/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java index 48a4b3c..15cad04 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java @@ -169,8 +169,8 @@ public class TestNamenodeCapacityReport { @Test public void testXceiverCount() throws Exception { Configuration conf = new HdfsConfiguration(); - // don't waste time retrying if close fails - conf.setInt(DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_RETRIES_KEY, 0); + // retry one time, if close fails + conf.setInt(DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_RETRIES_KEY, 1); MiniDFSCluster cluster = null; final int nodes = 8;
