You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2015/04/02 20:11:49 UTC
hadoop git commit: HDFS-7954.
TestBalancer#testBalancerWithPinnedBlocks should not be executed on Windows.
Contributed by Xiaoyu Yao
Repository: hadoop
Updated Branches:
refs/heads/trunk 9ed43f218 -> 4f412f487
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/4f412f48
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4f412f48
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4f412f48
Branch: refs/heads/trunk
Commit: 4f412f487cafe3abe7268498ee54730cd62eecf4
Parents: 9ed43f2
Author: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Authored: Thu Apr 2 11:11:34 2015 -0700
Committer: Tsz-Wo Nicholas Sze <sz...@hortonworks.com>
Committed: Thu Apr 2 11:11:34 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/4f412f48/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 0c66309..85c013e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1360,6 +1360,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/4f412f48/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 8b2d11e..9aea283 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);