Repository: hadoop Updated Branches: refs/heads/branch-2.7 b4d24d822 -> f7830f399
HADOOP-14970. MiniHadoopClusterManager doesn't respect lack of format option. Contributed by Erik Krogen (cherry picked from commit 1a407bc9906306801690bc75ff0f0456f8f265fd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f7830f39 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f7830f39 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f7830f39 Branch: refs/heads/branch-2.7 Commit: f7830f399a73a88b20deeb881ef7b55af5e5adad Parents: b4d24d8 Author: Erik Krogen <ekro...@linkedin.com> Authored: Thu Apr 12 23:27:51 2018 -0700 Committer: Konstantin V Shvachko <s...@apache.org> Committed: Thu Apr 12 23:54:03 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f7830f39/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java index 2e8ba5e..4055b06 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/MiniHadoopClusterManager.java @@ -152,7 +152,9 @@ public class MiniHadoopClusterManager { URISyntaxException { if (!noDFS) { dfs = new MiniDFSCluster.Builder(conf).nameNodePort(nnPort) - .numDataNodes(numDataNodes).startupOption(dfsOpts).build(); + .numDataNodes(numDataNodes) + .format(dfsOpts == StartupOption.FORMAT) + .startupOption(dfsOpts).build(); LOG.info("Started MiniDFSCluster -- namenode on port " + dfs.getNameNodePort()); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
