hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject [1/2] hadoop git commit: HDFS-8034. Fix TestDFSClientRetries#testDFSClientConfigurationLocateFollowingBlockInitialDelay for Windows. Contributed by Xiaoyu Yao.
Date Fri, 03 Apr 2015 17:18:44 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 5ea64e672 -> 0dde8c079
  refs/heads/trunk 228ae9aaa -> dc5596c36


HDFS-8034. Fix TestDFSClientRetries#testDFSClientConfigurationLocateFollowingBlockInitialDelay
for Windows. Contributed by Xiaoyu Yao.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dc5596c3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dc5596c3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dc5596c3

Branch: refs/heads/trunk
Commit: dc5596c36a261626fafda7f30638a000839d8392
Parents: 228ae9a
Author: cnauroth <cnauroth@apache.org>
Authored: Fri Apr 3 10:10:11 2015 -0700
Committer: cnauroth <cnauroth@apache.org>
Committed: Fri Apr 3 10:10:11 2015 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  4 +++
 .../hadoop/hdfs/TestDFSClientRetries.java       | 33 +++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc5596c3/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 04eac75..366d8fb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1366,6 +1366,10 @@ Release 2.7.0 - UNRELEASED
     HDFS-7954. TestBalancer#testBalancerWithPinnedBlocks should not be executed
     on Windows.  (Xiaoyu Yao via szetszwo)
 
+    HDFS-8034. Fix
+    TestDFSClientRetries#testDFSClientConfigurationLocateFollowingBlockInitialDelay
+    for Windows. (Xiaoyu Yao via cnauroth)
+
     BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
 
       HDFS-7720. Quota by Storage Type API, tools and ClientNameNode

http://git-wip-us.apache.org/repos/asf/hadoop/blob/dc5596c3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
index 3912774..c4258eb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
@@ -1136,20 +1136,23 @@ public class TestDFSClientRetries {
       throws Exception {
     // test if DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY
     // is not configured, verify DFSClient uses the default value 400.
-    Configuration dfsConf = new HdfsConfiguration();
-    MiniDFSCluster cluster = new MiniDFSCluster.Builder(dfsConf).build();
-    cluster.waitActive();
-    NamenodeProtocols nn = cluster.getNameNodeRpc();
-    DFSClient client = new DFSClient(null, nn, dfsConf, null);
-    assertEquals(client.getConf().
-        getBlockWriteLocateFollowingInitialDelayMs(), 400);
-
-    // change DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY,
-    // verify DFSClient uses the configured value 1000.
-    dfsConf.setInt(DFSConfigKeys.
-        DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY, 1000);
-    client = new DFSClient(null, nn, dfsConf, null);
-    assertEquals(client.getConf().
-        getBlockWriteLocateFollowingInitialDelayMs(), 1000);
+    MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build();
+    try {
+      cluster.waitActive();
+      NamenodeProtocols nn = cluster.getNameNodeRpc();
+      DFSClient client = new DFSClient(null, nn, conf, null);
+      assertEquals(client.getConf().
+          getBlockWriteLocateFollowingInitialDelayMs(), 400);
+
+      // change DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY,
+      // verify DFSClient uses the configured value 1000.
+      conf.setInt(DFSConfigKeys.
+          DFS_CLIENT_BLOCK_WRITE_LOCATEFOLLOWINGBLOCK_INITIAL_DELAY_KEY, 1000);
+      client = new DFSClient(null, nn, conf, null);
+      assertEquals(client.getConf().
+          getBlockWriteLocateFollowingInitialDelayMs(), 1000);
+    } finally {
+      cluster.shutdown();
+    }
   }
 }


Mime
View raw message