HADOOP-12764. Increase default value of KMX maxHttpHeaderSize and make it configurable.
Change-Id: I6e970563c201152e1428feafb8124e61c15a6fc0 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4ef1324f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ef1324f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ef1324f Branch: refs/heads/yarn-2877 Commit: 4ef1324ff66fe6c5ffbb828143e231fcafb143a9 Parents: 5cf5c41 Author: Zhe Zhang <z...@apache.org> Authored: Wed Feb 10 09:56:40 2016 -0800 Committer: Zhe Zhang <z...@apache.org> Committed: Wed Feb 10 09:56:40 2016 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/main/bin/hadoop-functions.sh | 1 + hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh | 4 ++++ hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh | 1 + hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml | 3 ++- .../hadoop-kms/src/main/tomcat/ssl-server.xml.conf | 1 + hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm | 1 + 7 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ef1324f/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f8535e1..5a450bf 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1111,6 +1111,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12752. Improve diagnostics/use of envvar/sysprop credential propagation (Steve Loughran via cnauroth) + HADOOP-12764. Increase default value of KMX maxHttpHeaderSize and make it + configurable. (zhz) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ef1324f/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh index 453e5ba..fa52e22 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh @@ -1221,6 +1221,7 @@ function hadoop_finalize_catalina_opts hadoop_add_param CATALINA_OPTS "${prefix}.admin.port" "-D${prefix}.admin.port=${HADOOP_CATALINA_ADMIN_PORT}" hadoop_add_param CATALINA_OPTS "${prefix}.http.port" "-D${prefix}.http.port=${HADOOP_CATALINA_HTTP_PORT}" hadoop_add_param CATALINA_OPTS "${prefix}.max.threads" "-D${prefix}.max.threads=${HADOOP_CATALINA_MAX_THREADS}" + hadoop_add_param CATALINA_OPTS "${prefix}.max.http.header.size" "-D${prefix}.max.http.header.size=${HADOOP_CATALINA_MAX_HTTP_HEADER_SIZE}" hadoop_add_param CATALINA_OPTS "${prefix}.ssl.keystore.file" "-D${prefix}.ssl.keystore.file=${HADOOP_CATALINA_SSL_KEYSTORE_FILE}" } http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ef1324f/hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh b/hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh index 41449ef..c3bc772 100644 --- a/hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh +++ b/hadoop-common-project/hadoop-kms/src/main/conf/kms-env.sh @@ -34,6 +34,10 @@ # # export KMS_MAX_THREADS=1000 +# The maximum size of Tomcat HTTP header +# +# export KMS_MAX_HTTP_HEADER_SIZE=65536 + # The location of the SSL keystore if using SSL # # export KMS_SSL_KEYSTORE_FILE=${HOME}/.keystore http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ef1324f/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh b/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh index df48889..c88aa87 100644 --- a/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh +++ b/hadoop-common-project/hadoop-kms/src/main/libexec/kms-config.sh @@ -40,6 +40,7 @@ function hadoop_subproject_init export HADOOP_CATALINA_HTTP_PORT="${KMS_HTTP_PORT:-16000}" export HADOOP_CATALINA_ADMIN_PORT="${KMS_ADMIN_PORT:-$((HADOOP_CATALINA_HTTP_PORT+1))}" export HADOOP_CATALINA_MAX_THREADS="${KMS_MAX_THREADS:-1000}" + export HADOOP_CATALINA_MAX_HTTP_HEADER_SIZE="${KMS_MAX_HTTP_HEADER_SIZE:-65536}" export HADOOP_CATALINA_SSL_KEYSTORE_FILE="${KMS_SSL_KEYSTORE_FILE:-${HOME}/.keystore}" http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ef1324f/hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml b/hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml index 516a6a9..d8fd161 100644 --- a/hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml +++ b/hadoop-common-project/hadoop-kms/src/main/tomcat/server.xml @@ -75,7 +75,8 @@ <Connector port="${kms.http.port}" protocol="HTTP/1.1" maxThreads="${kms.max.threads}" connectionTimeout="20000" - redirectPort="8443"/> + redirectPort="8443" + maxHttpHeaderSize="${kms.max.http.header.size}"/> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ef1324f/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf index 05b53e0..01b429c 100644 --- a/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf +++ b/hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml.conf @@ -70,6 +70,7 @@ described in the APR documentation --> <Connector port="${kms.http.port}" protocol="HTTP/1.1" SSLEnabled="true" maxThreads="${kms.max.threads}" scheme="https" secure="true" + maxHttpHeaderSize="${kms.max.http.header.size}" clientAuth="false" sslEnabledProtocols="TLSv1,TLSv1.1,TLSv1.2,SSLv2Hello" truststorePass="_kms_ssl_truststore_pass_" keystoreFile="${kms.ssl.keystore.file}" http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ef1324f/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm index ad4bfca..f0958be 100644 --- a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm +++ b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm @@ -120,6 +120,7 @@ The following environment variables (which can be set in KMS's `etc/hadoop/kms-e * KMS_HTTP_PORT * KMS_ADMIN_PORT * KMS_MAX_THREADS +* KMS_MAX_HTTP_HEADER_SIZE * KMS_LOGNOTE: You need to restart the KMS for the configuration changes to take effect. $H3 Loading native libraries
