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 cd...@apache.org on 2018/04/23 18:20:50 UTC
[1/5] hadoop git commit: HDFS-13408. MiniDFSCluster to support being
built on randomized base directory. Contributed by Xiao Liang
Repository: hadoop
Updated Branches:
refs/heads/branch-2 a97525030 -> 99e82e2c2
refs/heads/branch-2.9 b78d3c25c -> 0539b7234
refs/heads/branch-3.0 e8f62357c -> 956ab12ed
refs/heads/branch-3.1 1f486a064 -> cf272c517
refs/heads/trunk c533c7704 -> f411de6a7
HDFS-13408. MiniDFSCluster to support being built on randomized base directory. Contributed by Xiao Liang
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f411de6a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f411de6a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f411de6a
Branch: refs/heads/trunk
Commit: f411de6a79a0a87f03c09366cfe7a7d0726ed932
Parents: c533c77
Author: Chris Douglas <cd...@apache.org>
Authored: Mon Apr 23 11:13:18 2018 -0700
Committer: Chris Douglas <cd...@apache.org>
Committed: Mon Apr 23 11:13:18 2018 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 22 +++++++++++++++++++-
.../apache/hadoop/hdfs/TestMiniDFSCluster.java | 16 +++++++-------
2 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f411de6a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 4c3aed7..acb720e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -202,8 +202,28 @@ public class MiniDFSCluster implements AutoCloseable {
this.conf = conf;
this.storagesPerDatanode =
FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == conf.get(HDFS_MINIDFS_BASEDIR)) {
+ conf.set(HDFS_MINIDFS_BASEDIR,
+ new File(getBaseDirectory()).getAbsolutePath());
+ }
}
-
+
+ public Builder(Configuration conf, File basedir) {
+ this.conf = conf;
+ this.storagesPerDatanode =
+ FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == basedir) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory cannot be null");
+ }
+ String cdir = conf.get(HDFS_MINIDFS_BASEDIR);
+ if (cdir != null) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory already defined (" + cdir + ")");
+ }
+ conf.set(HDFS_MINIDFS_BASEDIR, basedir.getAbsolutePath());
+ }
+
/**
* Default: 0
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f411de6a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
index d631b68..afc977f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
@@ -201,9 +201,8 @@ public class TestMiniDFSCluster {
public void testIsClusterUpAfterShutdown() throws Throwable {
Configuration conf = new HdfsConfiguration();
File testDataCluster4 = new File(testDataPath, CLUSTER_4);
- String c4Path = testDataCluster4.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c4Path);
- MiniDFSCluster cluster4 = new MiniDFSCluster.Builder(conf).build();
+ MiniDFSCluster cluster4 =
+ new MiniDFSCluster.Builder(conf, testDataCluster4).build();
try {
DistributedFileSystem dfs = cluster4.getFileSystem();
dfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
@@ -222,12 +221,11 @@ public class TestMiniDFSCluster {
Configuration conf = new HdfsConfiguration();
conf.set(DFSConfigKeys.DFS_DATANODE_HOST_NAME_KEY, "MYHOST");
File testDataCluster5 = new File(testDataPath, CLUSTER_5);
- String c5Path = testDataCluster5.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c5Path);
- try (MiniDFSCluster cluster5 = new MiniDFSCluster.Builder(conf)
- .numDataNodes(1)
- .checkDataNodeHostConfig(true)
- .build()) {
+ try (MiniDFSCluster cluster5 =
+ new MiniDFSCluster.Builder(conf, testDataCluster5)
+ .numDataNodes(1)
+ .checkDataNodeHostConfig(true)
+ .build()) {
assertEquals("DataNode hostname config not respected", "MYHOST",
cluster5.getDataNodes().get(0).getDatanodeId().getHostName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/5] hadoop git commit: HDFS-13408. MiniDFSCluster to support being
built on randomized base directory. Contributed by Xiao Liang
Posted by cd...@apache.org.
HDFS-13408. MiniDFSCluster to support being built on randomized base directory. Contributed by Xiao Liang
(cherry picked from commit f411de6a79a0a87f03c09366cfe7a7d0726ed932)
(cherry picked from commit cf272c5179a9cb4b524016c0fca7c69c9eaa92f1)
(cherry picked from commit 956ab12ede390e1eea0a66752e0e6711f47b4b94)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/99e82e2c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/99e82e2c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/99e82e2c
Branch: refs/heads/branch-2
Commit: 99e82e2c2cf554fa5582da2ec9615fd8b698eecc
Parents: a975250
Author: Chris Douglas <cd...@apache.org>
Authored: Mon Apr 23 11:13:18 2018 -0700
Committer: Chris Douglas <cd...@apache.org>
Committed: Mon Apr 23 11:15:28 2018 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 22 +++++++++++++++++++-
.../apache/hadoop/hdfs/TestMiniDFSCluster.java | 16 +++++++-------
2 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/99e82e2c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 887c635..a643077 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -198,8 +198,28 @@ public class MiniDFSCluster implements AutoCloseable {
this.conf = conf;
this.storagesPerDatanode =
FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == conf.get(HDFS_MINIDFS_BASEDIR)) {
+ conf.set(HDFS_MINIDFS_BASEDIR,
+ new File(getBaseDirectory()).getAbsolutePath());
+ }
}
-
+
+ public Builder(Configuration conf, File basedir) {
+ this.conf = conf;
+ this.storagesPerDatanode =
+ FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == basedir) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory cannot be null");
+ }
+ String cdir = conf.get(HDFS_MINIDFS_BASEDIR);
+ if (cdir != null) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory already defined (" + cdir + ")");
+ }
+ conf.set(HDFS_MINIDFS_BASEDIR, basedir.getAbsolutePath());
+ }
+
/**
* Default: 0
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/99e82e2c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
index e1346e9..296ede3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
@@ -200,9 +200,8 @@ public class TestMiniDFSCluster {
public void testIsClusterUpAfterShutdown() throws Throwable {
Configuration conf = new HdfsConfiguration();
File testDataCluster4 = new File(testDataPath, CLUSTER_4);
- String c4Path = testDataCluster4.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c4Path);
- MiniDFSCluster cluster4 = new MiniDFSCluster.Builder(conf).build();
+ MiniDFSCluster cluster4 =
+ new MiniDFSCluster.Builder(conf, testDataCluster4).build();
try {
DistributedFileSystem dfs = cluster4.getFileSystem();
dfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
@@ -221,12 +220,11 @@ public class TestMiniDFSCluster {
Configuration conf = new HdfsConfiguration();
conf.set(DFSConfigKeys.DFS_DATANODE_HOST_NAME_KEY, "MYHOST");
File testDataCluster5 = new File(testDataPath, CLUSTER_5);
- String c5Path = testDataCluster5.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c5Path);
- try (MiniDFSCluster cluster5 = new MiniDFSCluster.Builder(conf)
- .numDataNodes(1)
- .checkDataNodeHostConfig(true)
- .build()) {
+ try (MiniDFSCluster cluster5 =
+ new MiniDFSCluster.Builder(conf, testDataCluster5)
+ .numDataNodes(1)
+ .checkDataNodeHostConfig(true)
+ .build()) {
assertEquals("DataNode hostname config not respected", "MYHOST",
cluster5.getDataNodes().get(0).getDatanodeId().getHostName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/5] hadoop git commit: HDFS-13408. MiniDFSCluster to support being
built on randomized base directory. Contributed by Xiao Liang
Posted by cd...@apache.org.
HDFS-13408. MiniDFSCluster to support being built on randomized base directory. Contributed by Xiao Liang
(cherry picked from commit f411de6a79a0a87f03c09366cfe7a7d0726ed932)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cf272c51
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cf272c51
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cf272c51
Branch: refs/heads/branch-3.1
Commit: cf272c5179a9cb4b524016c0fca7c69c9eaa92f1
Parents: 1f486a0
Author: Chris Douglas <cd...@apache.org>
Authored: Mon Apr 23 11:13:18 2018 -0700
Committer: Chris Douglas <cd...@apache.org>
Committed: Mon Apr 23 11:13:52 2018 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 22 +++++++++++++++++++-
.../apache/hadoop/hdfs/TestMiniDFSCluster.java | 16 +++++++-------
2 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf272c51/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 4c3aed7..acb720e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -202,8 +202,28 @@ public class MiniDFSCluster implements AutoCloseable {
this.conf = conf;
this.storagesPerDatanode =
FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == conf.get(HDFS_MINIDFS_BASEDIR)) {
+ conf.set(HDFS_MINIDFS_BASEDIR,
+ new File(getBaseDirectory()).getAbsolutePath());
+ }
}
-
+
+ public Builder(Configuration conf, File basedir) {
+ this.conf = conf;
+ this.storagesPerDatanode =
+ FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == basedir) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory cannot be null");
+ }
+ String cdir = conf.get(HDFS_MINIDFS_BASEDIR);
+ if (cdir != null) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory already defined (" + cdir + ")");
+ }
+ conf.set(HDFS_MINIDFS_BASEDIR, basedir.getAbsolutePath());
+ }
+
/**
* Default: 0
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf272c51/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
index d631b68..afc977f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
@@ -201,9 +201,8 @@ public class TestMiniDFSCluster {
public void testIsClusterUpAfterShutdown() throws Throwable {
Configuration conf = new HdfsConfiguration();
File testDataCluster4 = new File(testDataPath, CLUSTER_4);
- String c4Path = testDataCluster4.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c4Path);
- MiniDFSCluster cluster4 = new MiniDFSCluster.Builder(conf).build();
+ MiniDFSCluster cluster4 =
+ new MiniDFSCluster.Builder(conf, testDataCluster4).build();
try {
DistributedFileSystem dfs = cluster4.getFileSystem();
dfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
@@ -222,12 +221,11 @@ public class TestMiniDFSCluster {
Configuration conf = new HdfsConfiguration();
conf.set(DFSConfigKeys.DFS_DATANODE_HOST_NAME_KEY, "MYHOST");
File testDataCluster5 = new File(testDataPath, CLUSTER_5);
- String c5Path = testDataCluster5.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c5Path);
- try (MiniDFSCluster cluster5 = new MiniDFSCluster.Builder(conf)
- .numDataNodes(1)
- .checkDataNodeHostConfig(true)
- .build()) {
+ try (MiniDFSCluster cluster5 =
+ new MiniDFSCluster.Builder(conf, testDataCluster5)
+ .numDataNodes(1)
+ .checkDataNodeHostConfig(true)
+ .build()) {
assertEquals("DataNode hostname config not respected", "MYHOST",
cluster5.getDataNodes().get(0).getDatanodeId().getHostName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[5/5] hadoop git commit: HDFS-13408. MiniDFSCluster to support being
built on randomized base directory. Contributed by Xiao Liang
Posted by cd...@apache.org.
HDFS-13408. MiniDFSCluster to support being built on randomized base directory. Contributed by Xiao Liang
(cherry picked from commit f411de6a79a0a87f03c09366cfe7a7d0726ed932)
(cherry picked from commit cf272c5179a9cb4b524016c0fca7c69c9eaa92f1)
(cherry picked from commit 956ab12ede390e1eea0a66752e0e6711f47b4b94)
(cherry picked from commit 99e82e2c2cf554fa5582da2ec9615fd8b698eecc)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0539b723
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0539b723
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0539b723
Branch: refs/heads/branch-2.9
Commit: 0539b72341e6cacd1e6fb9675182c35730bfaf38
Parents: b78d3c2
Author: Chris Douglas <cd...@apache.org>
Authored: Mon Apr 23 11:13:18 2018 -0700
Committer: Chris Douglas <cd...@apache.org>
Committed: Mon Apr 23 11:15:41 2018 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 22 +++++++++++++++++++-
.../apache/hadoop/hdfs/TestMiniDFSCluster.java | 16 +++++++-------
2 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0539b723/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 887c635..a643077 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -198,8 +198,28 @@ public class MiniDFSCluster implements AutoCloseable {
this.conf = conf;
this.storagesPerDatanode =
FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == conf.get(HDFS_MINIDFS_BASEDIR)) {
+ conf.set(HDFS_MINIDFS_BASEDIR,
+ new File(getBaseDirectory()).getAbsolutePath());
+ }
}
-
+
+ public Builder(Configuration conf, File basedir) {
+ this.conf = conf;
+ this.storagesPerDatanode =
+ FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == basedir) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory cannot be null");
+ }
+ String cdir = conf.get(HDFS_MINIDFS_BASEDIR);
+ if (cdir != null) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory already defined (" + cdir + ")");
+ }
+ conf.set(HDFS_MINIDFS_BASEDIR, basedir.getAbsolutePath());
+ }
+
/**
* Default: 0
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0539b723/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
index e1346e9..296ede3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
@@ -200,9 +200,8 @@ public class TestMiniDFSCluster {
public void testIsClusterUpAfterShutdown() throws Throwable {
Configuration conf = new HdfsConfiguration();
File testDataCluster4 = new File(testDataPath, CLUSTER_4);
- String c4Path = testDataCluster4.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c4Path);
- MiniDFSCluster cluster4 = new MiniDFSCluster.Builder(conf).build();
+ MiniDFSCluster cluster4 =
+ new MiniDFSCluster.Builder(conf, testDataCluster4).build();
try {
DistributedFileSystem dfs = cluster4.getFileSystem();
dfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
@@ -221,12 +220,11 @@ public class TestMiniDFSCluster {
Configuration conf = new HdfsConfiguration();
conf.set(DFSConfigKeys.DFS_DATANODE_HOST_NAME_KEY, "MYHOST");
File testDataCluster5 = new File(testDataPath, CLUSTER_5);
- String c5Path = testDataCluster5.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c5Path);
- try (MiniDFSCluster cluster5 = new MiniDFSCluster.Builder(conf)
- .numDataNodes(1)
- .checkDataNodeHostConfig(true)
- .build()) {
+ try (MiniDFSCluster cluster5 =
+ new MiniDFSCluster.Builder(conf, testDataCluster5)
+ .numDataNodes(1)
+ .checkDataNodeHostConfig(true)
+ .build()) {
assertEquals("DataNode hostname config not respected", "MYHOST",
cluster5.getDataNodes().get(0).getDatanodeId().getHostName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/5] hadoop git commit: HDFS-13408. MiniDFSCluster to support being
built on randomized base directory. Contributed by Xiao Liang
Posted by cd...@apache.org.
HDFS-13408. MiniDFSCluster to support being built on randomized base directory. Contributed by Xiao Liang
(cherry picked from commit f411de6a79a0a87f03c09366cfe7a7d0726ed932)
(cherry picked from commit cf272c5179a9cb4b524016c0fca7c69c9eaa92f1)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/956ab12e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/956ab12e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/956ab12e
Branch: refs/heads/branch-3.0
Commit: 956ab12ede390e1eea0a66752e0e6711f47b4b94
Parents: e8f6235
Author: Chris Douglas <cd...@apache.org>
Authored: Mon Apr 23 11:13:18 2018 -0700
Committer: Chris Douglas <cd...@apache.org>
Committed: Mon Apr 23 11:15:15 2018 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 22 +++++++++++++++++++-
.../apache/hadoop/hdfs/TestMiniDFSCluster.java | 16 +++++++-------
2 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/956ab12e/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 36a45d8..0edc13e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -199,8 +199,28 @@ public class MiniDFSCluster implements AutoCloseable {
this.conf = conf;
this.storagesPerDatanode =
FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == conf.get(HDFS_MINIDFS_BASEDIR)) {
+ conf.set(HDFS_MINIDFS_BASEDIR,
+ new File(getBaseDirectory()).getAbsolutePath());
+ }
}
-
+
+ public Builder(Configuration conf, File basedir) {
+ this.conf = conf;
+ this.storagesPerDatanode =
+ FsDatasetTestUtils.Factory.getFactory(conf).getDefaultNumOfDataDirs();
+ if (null == basedir) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory cannot be null");
+ }
+ String cdir = conf.get(HDFS_MINIDFS_BASEDIR);
+ if (cdir != null) {
+ throw new IllegalArgumentException(
+ "MiniDFSCluster base directory already defined (" + cdir + ")");
+ }
+ conf.set(HDFS_MINIDFS_BASEDIR, basedir.getAbsolutePath());
+ }
+
/**
* Default: 0
*/
http://git-wip-us.apache.org/repos/asf/hadoop/blob/956ab12e/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
index d631b68..afc977f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
@@ -201,9 +201,8 @@ public class TestMiniDFSCluster {
public void testIsClusterUpAfterShutdown() throws Throwable {
Configuration conf = new HdfsConfiguration();
File testDataCluster4 = new File(testDataPath, CLUSTER_4);
- String c4Path = testDataCluster4.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c4Path);
- MiniDFSCluster cluster4 = new MiniDFSCluster.Builder(conf).build();
+ MiniDFSCluster cluster4 =
+ new MiniDFSCluster.Builder(conf, testDataCluster4).build();
try {
DistributedFileSystem dfs = cluster4.getFileSystem();
dfs.setSafeMode(HdfsConstants.SafeModeAction.SAFEMODE_ENTER);
@@ -222,12 +221,11 @@ public class TestMiniDFSCluster {
Configuration conf = new HdfsConfiguration();
conf.set(DFSConfigKeys.DFS_DATANODE_HOST_NAME_KEY, "MYHOST");
File testDataCluster5 = new File(testDataPath, CLUSTER_5);
- String c5Path = testDataCluster5.getAbsolutePath();
- conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c5Path);
- try (MiniDFSCluster cluster5 = new MiniDFSCluster.Builder(conf)
- .numDataNodes(1)
- .checkDataNodeHostConfig(true)
- .build()) {
+ try (MiniDFSCluster cluster5 =
+ new MiniDFSCluster.Builder(conf, testDataCluster5)
+ .numDataNodes(1)
+ .checkDataNodeHostConfig(true)
+ .build()) {
assertEquals("DataNode hostname config not respected", "MYHOST",
cluster5.getDataNodes().get(0).getDatanodeId().getHostName());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org