From 77609e646587a64baeb22a11fd5e4146229c2c7a Mon Sep 17 00:00:00 2001
From: Jing Zhao <jing9@apache.org>
Date: Tue, 23 Jun 2015 22:16:16 -0700
Subject: [PATCH] HDFS-8639. Add Option for NameNode HTTP port in
 MiniDFSClusterManager. Contributed by Kai Sasaki.

(cherry picked from commit 2ba646572185b91d6db1b09837abdcbadbfbeb49)
---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                   | 3 +++
 .../java/org/apache/hadoop/test/MiniDFSClusterManager.java    | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 948e7250608..4402048c19b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -324,6 +324,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-6564. Use slf4j instead of common-logging in hdfs-client.
     (Rakesh R via wheat9)
 
+    HDFS-8639. Add Option for NameNode HTTP port in MiniDFSClusterManager.
+    (Kai Sasaki via jing9)
+
   OPTIMIZATIONS
 
     HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/MiniDFSClusterManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/MiniDFSClusterManager.java
index 7029f42926a..f8e931a9047 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/MiniDFSClusterManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/MiniDFSClusterManager.java
@@ -65,6 +65,7 @@ public class MiniDFSClusterManager {
   private String writeDetails;
   private int numDataNodes;
   private int nameNodePort;
+  private int nameNodeHttpPort;
   private StartupOption dfsOpts;
   private String writeConfig;
   private Configuration conf;
@@ -84,6 +85,7 @@ private Options makeOptions() {
         .addOption("cmdport", true,
             "Which port to listen on for commands (default 0--we choose)")
         .addOption("nnport", true, "NameNode port (default 0--we choose)")
+        .addOption("httpport", true, "NameNode http port (default 0--we choose)")
         .addOption("namenode", true, "URL of the namenode (default "
             + "is either the DFS cluster or a temporary dir)")     
         .addOption(OptionBuilder
@@ -137,6 +139,7 @@ private void sleepForever() {
    */
   public void start() throws IOException, FileNotFoundException {
     dfs = new MiniDFSCluster.Builder(conf).nameNodePort(nameNodePort)
+                                          .nameNodeHttpPort(nameNodeHttpPort)
                                           .numDataNodes(numDataNodes)
                                           .startupOption(dfsOpts)
                                           .format(format)
@@ -198,6 +201,7 @@ private boolean parseArguments(String[] args) {
     // HDFS
     numDataNodes = intArgument(cli, "datanodes", 1);
     nameNodePort = intArgument(cli, "nnport", 0);
+    nameNodeHttpPort = intArgument(cli, "httpport", 0);
     if (cli.hasOption("format")) {
       dfsOpts = StartupOption.FORMAT;
       format = true;