Repository: hadoop Updated Branches: refs/heads/branch-2 ce3f32590 -> 81ed3a2bb
HDFS-7954. TestBalancer#testBalancerWithPinnedBlocks should not be executed on 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/81ed3a2b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/81ed3a2b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/81ed3a2b Branch: refs/heads/branch-2 Commit: 81ed3a2bb83f7ec9cd620d5cad02ec3bf4163841 Parents: ce3f325 Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Thu Apr 2 11:11:34 2015 -0700 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Thu Apr 2 11:12:27 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/balancer/TestBalancer.java | 6 ++++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/81ed3a2b/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 a9f9dd4..c97f82c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1056,6 +1056,9 @@ Release 2.7.0 - UNRELEASED HDFS-8001 RpcProgramNfs3 : wrong parsing of dfs.blocksize (Remi Catherinot via brandonli) + HDFS-7954. TestBalancer#testBalancerWithPinnedBlocks should not be executed + on Windows. (Xiaoyu Yao via szetszwo) + 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/81ed3a2b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java index b5ef72b..53dddc7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java @@ -23,6 +23,7 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; import java.io.File; import java.io.IOException; @@ -309,6 +310,11 @@ public class TestBalancer { */ @Test(timeout=100000) public void testBalancerWithPinnedBlocks() throws Exception { + // This test assumes stick-bit based block pin mechanism available only + // in Linux/Unix. It can be unblocked on Windows when HDFS-7759 is ready to + // provide a different mechanism for Windows. + assumeTrue(!Path.WINDOWS); + final Configuration conf = new HdfsConfiguration(); initConf(conf); conf.setBoolean(DFS_DATANODE_BLOCK_PINNING_ENABLED, true);
