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
This commit is contained in:
Aaron T. Myers 2016-06-20 13:46:11 -07:00 committed by Xiao Chen
parent 42f8a1d6eb
commit 0f616cefeb
5 changed files with 17 additions and 0 deletions

View File

@ -44,6 +44,10 @@
# #
# export HTTPFS_SSL_ENABLED=false # 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 # The location of the SSL keystore if using SSL
# #
# export HTTPFS_SSL_KEYSTORE_FILE=${HOME}/.keystore # export HTTPFS_SSL_KEYSTORE_FILE=${HOME}/.keystore

View File

@ -164,6 +164,13 @@ else
print "Using HTTPFS_SSL_KEYSTORE_PASS: ${HTTPFS_SSL_KEYSTORE_PASS}" print "Using HTTPFS_SSL_KEYSTORE_PASS: ${HTTPFS_SSL_KEYSTORE_PASS}"
fi 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 if [ "${CATALINA_BASE}" = "" ]; then
export CATALINA_BASE=${HTTPFS_HOME}/share/hadoop/httpfs/tomcat export CATALINA_BASE=${HTTPFS_HOME}/share/hadoop/httpfs/tomcat
print "Setting CATALINA_BASE: ${CATALINA_BASE}" print "Setting CATALINA_BASE: ${CATALINA_BASE}"

View File

@ -71,6 +71,7 @@
--> -->
<Connector port="${httpfs.http.port}" protocol="HTTP/1.1" <Connector port="${httpfs.http.port}" protocol="HTTP/1.1"
connectionTimeout="20000" connectionTimeout="20000"
maxHttpHeaderSize="${httpfs.max.http.header.size}"
redirectPort="8443"/> redirectPort="8443"/>
<!-- A "Connector" using the shared thread pool--> <!-- A "Connector" using the shared thread pool-->
<!-- <!--

View File

@ -70,6 +70,7 @@
described in the APR documentation --> described in the APR documentation -->
<Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true" <Connector port="${httpfs.http.port}" protocol="HTTP/1.1" SSLEnabled="true"
maxThreads="150" scheme="https" secure="true" maxThreads="150" scheme="https" secure="true"
maxHttpHeaderSize="${httpfs.max.http.header.size}"
clientAuth="false" sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2,SSLv2Hello" clientAuth="false" sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2,SSLv2Hello"
keystoreFile="${httpfs.ssl.keystore.file}" keystoreFile="${httpfs.ssl.keystore.file}"
keystorePass="${httpfs.ssl.keystore.pass}"/> keystorePass="${httpfs.ssl.keystore.pass}"/>

View File

@ -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. 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: 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 * HTTPFS\_HTTP\_PORT
@ -88,6 +90,8 @@ The following environment variables (which can be set in HttpFS's `etc/hadoop/ht
* HADOOP\_LOG\_DIR * HADOOP\_LOG\_DIR
* HTTPFS\_MAX\_HTTP\_HEADER\_SIZE
HttpFS Configuration HttpFS Configuration
-------------------- --------------------