HDFS-17700. Fix HttpServer service's conf issue.

Author: huangzhaobo99

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/Router.java

@@ -509,6 +509,18 @@ public InetSocketAddress getHttpServerAddress() {
     return null;
   }
 
+  /**
+   * Get the current HTTP socket address for the router.
+   *
+   * @return InetSocketAddress HTTPS address.
+   */
+  public InetSocketAddress getHttpsServerAddress() {
+    if (httpServer != null) {
+      return httpServer.getHttpsAddress();
+    }
+    return null;
+  }
+
   @Override
   public void verifyToken(DelegationTokenIdentifier tokenId, byte[] password)
       throws IOException {

hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterHttpServer.java

@@ -24,17 +24,24 @@
 import org.apache.hadoop.hdfs.DFSUtil;
 import org.apache.hadoop.hdfs.server.common.JspHelper;
 import org.apache.hadoop.hdfs.server.namenode.NameNodeHttpServer;
+import org.apache.hadoop.http.HttpConfig;
 import org.apache.hadoop.http.HttpServer2;
+import org.apache.hadoop.net.NetUtils;
 import org.apache.hadoop.service.AbstractService;
 
 import javax.servlet.ServletContext;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Web interface for the {@link Router}. It exposes the Web UI and the WebHDFS
  * methods from {@link RouterWebHdfsMethods}.
  */
 public class RouterHttpServer extends AbstractService {
 
+  private static final Logger LOG = LoggerFactory.getLogger(RouterHttpServer.class);
+
   protected static final String NAMENODE_ATTRIBUTE_KEY = "name.node";
 
 
@@ -82,6 +89,7 @@ protected void serviceInit(Configuration configuration) throws Exception {
   protected void serviceStart() throws Exception {
     // Build and start server
     String webApp = "router";
+    HttpConfig.Policy policy = DFSUtil.getHttpPolicy(conf);
     HttpServer2.Builder builder = DFSUtil.httpServerTemplateForNNAndJN(
         this.conf, this.httpAddress, this.httpsAddress, webApp,
         RBFConfigKeys.DFS_ROUTER_KERBEROS_INTERNAL_SPNEGO_PRINCIPAL_KEY,
@@ -109,10 +117,26 @@ protected void serviceStart() throws Exception {
     this.httpServer.start();
 
     // The server port can be ephemeral... ensure we have the correct info
-    InetSocketAddress listenAddress = this.httpServer.getConnectorAddress(0);
-    if (listenAddress != null) {
-      this.httpAddress = new InetSocketAddress(this.httpAddress.getHostName(),
-          listenAddress.getPort());
+    int curIndex = 0;
+    if (policy.isHttpEnabled()) {
+      InetSocketAddress httpListenAddress = this.httpServer.getConnectorAddress(curIndex++);
+      if (httpListenAddress != null) {
+        this.httpAddress =
+            new InetSocketAddress(this.httpAddress.getHostName(), httpListenAddress.getPort());
+        conf.set(RBFConfigKeys.DFS_ROUTER_HTTP_ADDRESS_KEY,
+            NetUtils.getHostPortString(httpAddress));
+        LOG.info("Listening HTTP traffic on {}", httpAddress);
+      }
+    }
+    if (policy.isHttpsEnabled()) {
+      InetSocketAddress httpsListenAddress = this.httpServer.getConnectorAddress(curIndex);
+      if (httpsListenAddress != null) {
+        this.httpsAddress =
+            new InetSocketAddress(this.httpsAddress.getHostName(), httpsListenAddress.getPort());
+        conf.set(RBFConfigKeys.DFS_ROUTER_HTTPS_ADDRESS_KEY,
+            NetUtils.getHostPortString(httpsAddress));
+        LOG.info("Listening HTTPS traffic on {}", httpsAddress);
+      }
     }
     super.serviceStart();
   }

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/MiniRouterDFSCluster.java

@@ -71,6 +71,7 @@
 import org.apache.hadoop.fs.UnsupportedFileSystemException;
 import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
 import org.apache.hadoop.hdfs.DFSClient;
+import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.HdfsConfiguration;
 import org.apache.hadoop.hdfs.MiniDFSCluster;

hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterHttpServerXFrame.java hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterHttpServer.java

@@ -29,13 +29,14 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.hdfs.HdfsConfiguration;
+import org.apache.hadoop.http.HttpConfig;
 
 import static org.apache.hadoop.http.HttpServer2.XFrameOption.SAMEORIGIN;
 
 /**
- * A class to test the XFrame options of Router HTTP Server.
+ * A class to test the Router HTTP Server.
  */
-public class TestRouterHttpServerXFrame {
+public class TestRouterHttpServer {
 
   @Test
   public void testRouterXFrame() throws IOException {
@@ -62,4 +63,27 @@ public void testRouterXFrame() throws IOException {
       router.close();
     }
   }
+
+  @Test
+  public void testRouterHttpServerConfig() throws IOException {
+    Configuration conf = new HdfsConfiguration();
+    conf.set(DFSConfigKeys.DFS_HTTP_POLICY_KEY, HttpConfig.Policy.HTTP_AND_HTTPS.name());
+    Router router = new Router();
+    try {
+      router.init(conf);
+      router.start();
+
+      Configuration routerConfig = router.getConfig();
+      InetSocketAddress httpServerAddress = router.getHttpServerAddress();
+      Assert.assertEquals(httpServerAddress.getHostName() + ":" + httpServerAddress.getPort(),
+          routerConfig.get(RBFConfigKeys.DFS_ROUTER_HTTP_ADDRESS_KEY));
+
+      InetSocketAddress httpsServerAddress = router.getHttpsServerAddress();
+      Assert.assertEquals(httpsServerAddress.getHostName() + ":" + httpsServerAddress.getPort(),
+          routerConfig.get(RBFConfigKeys.DFS_ROUTER_HTTPS_ADDRESS_KEY));
+    } finally {
+      router.stop();
+      router.close();
+    }
+  }
 }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

@@ -1561,7 +1561,10 @@ private void initIpcServer() throws IOException {
     DFSUtil.addInternalPBProtocol(getConf(), InterDatanodeProtocolPB.class, service,
         ipcServer);
 
-    LOG.info("Opened IPC server at {}", ipcServer.getListenerAddress());
+    InetSocketAddress listenerAddress = ipcServer.getListenerAddress();
+    LOG.info("Opened IPC server at {}", listenerAddress);
+    dnConf.getConf().set(DFS_DATANODE_IPC_ADDRESS_KEY,
+        listenerAddress.getHostName() + ":" + listenerAddress.getPort());
 
     // set service-level authorization security policy
     if (getConf().getBoolean(

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/web/DatanodeHttpServer.java

@@ -303,7 +303,9 @@ public void start() throws IOException {
     if (httpServer != null) {
       InetSocketAddress infoAddr = DataNode.getInfoAddr(conf);
       httpAddress = getChannelLocalAddress(httpServer, infoAddr);
-      LOG.info("Listening HTTP traffic on " + httpAddress);
+      conf.set(DFSConfigKeys.DFS_DATANODE_HTTP_ADDRESS_KEY,
+          NetUtils.getHostPortString(httpAddress));
+      LOG.info("Listening HTTP traffic on {}", httpAddress);
     }
 
     if (httpsServer != null) {
@@ -312,7 +314,9 @@ public void start() throws IOException {
               DFS_DATANODE_HTTPS_ADDRESS_KEY,
               DFS_DATANODE_HTTPS_ADDRESS_DEFAULT));
       httpsAddress = getChannelLocalAddress(httpsServer, secInfoSocAddr);
-      LOG.info("Listening HTTPS traffic on " + httpsAddress);
+      conf.set(DFSConfigKeys.DFS_DATANODE_HTTPS_ADDRESS_KEY,
+          NetUtils.getHostPortString(httpsAddress));
+      LOG.info("Listening HTTPS traffic on {}", httpsAddress);
     }
   }
 

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeHttpServer.java

@@ -49,12 +49,17 @@
 import org.apache.hadoop.security.http.RestCsrfPreventionFilter;
 
 import com.sun.jersey.api.core.ResourceConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Encapsulates the HTTP server started by the NameNode. 
  */
 @InterfaceAudience.Private
 public class NameNodeHttpServer {
+
+  private static final Logger LOG = LoggerFactory.getLogger(NameNodeHttpServer.class);
+
   private HttpServer2 httpServer;
   private final Configuration conf;
   private final NameNode nn;
@@ -168,14 +173,20 @@ void start() throws IOException {
     int connIdx = 0;
     if (policy.isHttpEnabled()) {
       httpAddress = httpServer.getConnectorAddress(connIdx++);
-      conf.set(DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY,
-          NetUtils.getHostPortString(httpAddress));
+      if (httpAddress != null) {
+        conf.set(DFSConfigKeys.DFS_NAMENODE_HTTP_ADDRESS_KEY,
+            NetUtils.getHostPortString(httpAddress));
+        LOG.info("Listening HTTP traffic on {}", httpAddress);
+      }
     }
 
     if (policy.isHttpsEnabled()) {
       httpsAddress = httpServer.getConnectorAddress(connIdx);
-      conf.set(DFSConfigKeys.DFS_NAMENODE_HTTPS_ADDRESS_KEY,
-          NetUtils.getHostPortString(httpsAddress));
+      if (httpsAddress != null) {
+        conf.set(DFSConfigKeys.DFS_NAMENODE_HTTPS_ADDRESS_KEY,
+            NetUtils.getHostPortString(httpsAddress));
+        LOG.info("Listening HTTPS traffic on {}", httpsAddress);
+      }
     }
   }
 

hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/datanode.html

@@ -68,7 +68,7 @@
 
 <script type="text/x-dust-template" id="tmpl-dn">
 {#dn}
-<div class="page-header"><h1>DataNode on <small>{HostName}:{DataPort}</small></h1></div>
+<div class="page-header"><h1>DataNode on <small>{HostName}:{RpcPort}</small></h1></div>
 <table class="table table-bordered table-striped">
   <tr><th>Cluster ID:</th><td>{ClusterId}</td></tr>
   <tr><th>Started:</th><td>{DNStartedTimeInMillis|date_tostring}</td></tr>

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeConfig.java

@@ -18,13 +18,15 @@
 package org.apache.hadoop.hdfs;
 
 import static org.apache.hadoop.hdfs.server.common.Util.fileAsURI;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -165,4 +167,23 @@ public void testMemlockLimit() throws Exception {
           prevLimit);
     }
   }
+
+  @Test
+  public void testDataNodeIpcAndHttpSeverConf() throws Exception {
+    Configuration conf = cluster.getConfiguration(0);
+    DataNode dn = null;
+    try {
+      dn = DataNode.createDataNode(new String[] {}, conf);
+      Configuration dnConf = dn.getConf();
+      InetSocketAddress listenerAddress = dn.ipcServer.getListenerAddress();
+      assertThat(dnConf.get(DFSConfigKeys.DFS_DATANODE_IPC_ADDRESS_KEY))
+          .isEqualTo(listenerAddress.getHostName() + ":" + listenerAddress.getPort());
+      assertThat(dnConf.get(DFSConfigKeys.DFS_DATANODE_HTTP_ADDRESS_KEY))
+          .isEqualTo(listenerAddress.getHostName() + ":" + dn.getHttpPort());
+    } finally {
+      if (dn != null) {
+        dn.shutdown();
+      }
+    }
+  }
 }