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 xy...@apache.org on 2018/03/15 17:19:03 UTC
hadoop git commit: HDFS-13251. Avoid using hard coded datanode data
dirs in unit tests(addendum). Contributed by Ajay Kumar.
Repository: hadoop
Updated Branches:
refs/heads/trunk 6de135169 -> da777a549
HDFS-13251. Avoid using hard coded datanode data dirs in unit tests(addendum). Contributed by Ajay Kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/da777a54
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/da777a54
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/da777a54
Branch: refs/heads/trunk
Commit: da777a5498e73f9a44e810dc6771e5c8fe37b6f6
Parents: 6de1351
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Thu Mar 15 09:45:02 2018 -0700
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Thu Mar 15 10:18:44 2018 -0700
----------------------------------------------------------------------
.../datanode/TestDataNodeVolumeFailureToleration.java | 2 +-
.../java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/da777a54/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java
index 9a09570..f83609a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java
@@ -159,7 +159,7 @@ public class TestDataNodeVolumeFailureToleration {
long dnCapacity = DFSTestUtil.getDatanodeCapacity(dm, 0);
// Fail a volume on the 2nd DN
- File dn2Vol1 = cluster.getStorageDir(1, 0);
+ File dn2Vol1 = cluster.getInstanceStorageDir(1, 0);
DataNodeTestUtils.injectDataDirFailure(dn2Vol1);
// Should only get two replicas (the first DN and the 3rd)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/da777a54/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
index 34d34b8..5d0fd38 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
@@ -351,11 +351,11 @@ public class TestDFSAdmin {
}
File dnDir0 = cluster.getInstanceStorageDir(0, 0);
File dnDir1 = cluster.getInstanceStorageDir(0, 1);
- assertThat(outs.get(offset + 1),
- is(allOf(containsString("From:"), containsString(dnDir0.getName()),
- containsString(dnDir1.getName()))));
- assertThat(outs.get(offset + 2), is(not(
- anyOf(containsString(dnDir0.getName()),
+ assertThat(outs.get(offset + 1), is(allOf(containsString("From:"),
+ containsString(dnDir0.getName()),
+ containsString(dnDir1.getName()))));
+ assertThat(outs.get(offset + 2),
+ is(not(anyOf(containsString(dnDir0.getName()),
containsString(dnDir1.getName())))));
assertThat(outs.get(offset + 2),
is(allOf(containsString("To"), containsString("data_new"))));
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org