hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weic...@apache.org
Subject hadoop git commit: HDFS-13492. Limit httpfs binds to certain IP addresses in branch-2. Contributed by Wei-Chiu Chuang.
Date Thu, 26 Apr 2018 16:55:41 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 33ffc9608 -> a5fc63823


HDFS-13492. Limit httpfs binds to certain IP addresses in branch-2. Contributed by Wei-Chiu
Chuang.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a5fc6382
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a5fc6382
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a5fc6382

Branch: refs/heads/branch-2
Commit: a5fc6382351150ec3fede697dbf03a4670264f16
Parents: 33ffc96
Author: Wei-Chiu Chuang <weichiu@apache.org>
Authored: Thu Apr 26 09:55:03 2018 -0700
Committer: Wei-Chiu Chuang <weichiu@apache.org>
Committed: Thu Apr 26 09:55:03 2018 -0700

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml | 3 ++-
 .../hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml             | 3 ++-
 .../hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm        | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5fc6382/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
index 67f2159..f160893 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml
@@ -69,7 +69,8 @@
          APR (HTTP/AJP) Connector: /docs/apr.html
          Define a non-SSL HTTP/1.1 Connector on port ${httpfs.http.port}
     -->
-    <Connector port="${httpfs.http.port}" protocol="HTTP/1.1"
+    <Connector address="${httpfs.http.hostname}"
+               port="${httpfs.http.port}" protocol="HTTP/1.1"
                connectionTimeout="20000"
                maxHttpHeaderSize="${httpfs.max.http.header.size}"
                redirectPort="8443"/>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5fc6382/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
index 408d4e3..a85ada9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml
@@ -68,7 +68,8 @@
          This connector uses the JSSE configuration, when using APR, the
          connector should be using the OpenSSL style configuration
          described in the APR documentation -->
-    <Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true"
+    <Connector address="${httpfs.http.hostname}"
+               port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true"
                maxThreads="150" scheme="https" secure="true"
                maxHttpHeaderSize="${httpfs.max.http.header.size}"
                clientAuth="${httpfs.ssl.client.auth}"

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5fc6382/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
index 35c3822..305342d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm
@@ -72,13 +72,14 @@ Embedded Tomcat Configuration
 
 To configure the embedded Tomcat go to the `tomcat/conf`.
 
-HttpFS preconfigures the HTTP and Admin ports in Tomcat's `server.xml` to 14000 and 14001.
+HttpFS preconfigures the HTTP and Admin ports in Tomcat's `server.xml` to 14000 and 14001,
and it binds to all IP addresses on the host.
 
 Tomcat logs are also preconfigured to go to HttpFS's `logs/` directory.
 
 HttpFS default value for the maxHttpHeaderSize parameter in Tomcat's `server.xml` is set
to 65536 by default.
 
 The following environment variables (which can be set in HttpFS's `etc/hadoop/httpfs-env.sh`
script) can be used to alter those values:
+* HTTPFS\_HTTP\_HOSTNAME
 
 * HTTPFS\_HTTP\_PORT
 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message