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 xi...@apache.org on 2016/10/20 20:35:29 UTC
hadoop git commit: HDFS-10423. Increase default value of httpfs
maxHttpHeaderSize. Contributed by Nicolae Popa.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 42f8a1d6e -> 0f616cefe
HDFS-10423. Increase default value of httpfs maxHttpHeaderSize. Contributed by Nicolae Popa.
(cherry picked from commit aa1b583cf99d1a7cfe554d1769fc4af252374663)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f616cef
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f616cef
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f616cef
Branch: refs/heads/branch-2
Commit: 0f616cefeb3a946a9a359cf2234b154cfed47072
Parents: 42f8a1d
Author: Aaron T. Myers <at...@apache.org>
Authored: Mon Jun 20 13:46:11 2016 -0700
Committer: Xiao Chen <xi...@apache.org>
Committed: Thu Oct 20 13:34:52 2016 -0700
----------------------------------------------------------------------
.../hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh | 4 ++++
.../hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh | 7 +++++++
.../hadoop-hdfs-httpfs/src/main/tomcat/server.xml | 1 +
.../hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml | 1 +
.../hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm | 4 ++++
5 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f616cef/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh
index a2701d4..f19f706 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh
@@ -44,6 +44,10 @@
#
# export HTTPFS_SSL_ENABLED=false
+# The maximum size of Tomcat HTTP header
+#
+# export HTTPFS_MAX_HTTP_HEADER_SIZE=65536
+
# The location of the SSL keystore if using SSL
#
# export HTTPFS_SSL_KEYSTORE_FILE=${HOME}/.keystore
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f616cef/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
index a2fe1c2..5ecb61a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
@@ -164,6 +164,13 @@ else
print "Using HTTPFS_SSL_KEYSTORE_PASS: ${HTTPFS_SSL_KEYSTORE_PASS}"
fi
+if [ "${HTTPFS_MAX_HTTP_HEADER_SIZE}" = "" ]; then
+ export HTTPFS_MAX_HTTP_HEADER_SIZE=65536
+ print "Setting HTTPFS_MAX_HTTP_HEADER_SIZE: ${HTTPFS_MAX_HTTP_HEADER_SIZE}"
+else
+ print "Using HTTPFS_MAX_HTTP_HEADER_SIZE: ${HTTPFS_MAX_HTTP_HEADER_SIZE}"
+fi
+
if [ "${CATALINA_BASE}" = "" ]; then
export CATALINA_BASE=${HTTPFS_HOME}/share/hadoop/httpfs/tomcat
print "Setting CATALINA_BASE: ${CATALINA_BASE}"
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f616cef/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 a425bdd..67f2159 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
@@ -71,6 +71,7 @@
-->
<Connector port="${httpfs.http.port}" protocol="HTTP/1.1"
connectionTimeout="20000"
+ maxHttpHeaderSize="${httpfs.max.http.header.size}"
redirectPort="8443"/>
<!-- A "Connector" using the shared thread pool-->
<!--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f616cef/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 287c9f5..92bee15 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
@@ -70,6 +70,7 @@
described in the APR documentation -->
<Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true"
+ maxHttpHeaderSize="${httpfs.max.http.header.size}"
clientAuth="false" sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2,SSLv2Hello"
keystoreFile="${httpfs.ssl.keystore.file}"
keystorePass="${httpfs.ssl.keystore.pass}"/>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f616cef/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 3c7f9d3..6a03a45 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
@@ -80,6 +80,8 @@ HttpFS preconfigures the HTTP and Admin ports in Tomcat's `server.xml` to 14000
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\_PORT
@@ -88,6 +90,8 @@ The following environment variables (which can be set in HttpFS's `etc/hadoop/ht
* HADOOP\_LOG\_DIR
+* HTTPFS\_MAX\_HTTP\_HEADER\_SIZE
+
HttpFS Configuration
--------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org