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 ar...@apache.org on 2015/03/18 20:26:57 UTC
[2/3] hadoop git commit: HDFS-7948.
TestDataNodeHotSwapVolumes#testAddVolumeFailures failed on Windows.
(Contributed by Xiaoyu Yao)
HDFS-7948. TestDataNodeHotSwapVolumes#testAddVolumeFailures failed 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/a08b1b57
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a08b1b57
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a08b1b57
Branch: refs/heads/branch-2
Commit: a08b1b5703e0fe90e332fbd5c28a2b84e7638288
Parents: b547e6d
Author: Arpit Agarwal <ar...@apache.org>
Authored: Wed Mar 18 12:26:00 2015 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Wed Mar 18 12:26:11 2015 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a08b1b57/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 25cdf98..4a2085f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -872,6 +872,9 @@ Release 2.7.0 - UNRELEASED
HDFS-7953. NN Web UI fails to navigate to paths that contain #.
(kanaka kumar avvaru via wheat9)
+ HDFS-7948. TestDataNodeHotSwapVolumes#testAddVolumeFailures failed on
+ Windows. (Xiaoyu Yao via Arpit Agarwal)
+
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/a08b1b57/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java
index 466598b..8ab3dd2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeHotSwapVolumes.java
@@ -521,7 +521,7 @@ public class TestDataNodeHotSwapVolumes {
dn.getConf().get(DFS_DATANODE_DATA_DIR_KEY).split(",");
assertEquals(4, effectiveVolumes.length);
for (String ev : effectiveVolumes) {
- assertThat(new File(ev).getCanonicalPath(),
+ assertThat(StorageLocation.parse(ev).getFile().getCanonicalPath(),
is(not(anyOf(is(newDirs.get(0)), is(newDirs.get(2))))));
}
}