Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14375. Remove tomcat support from hadoop-functions.sh. Contributed by John Zhuge.

This commit is contained in:
Akira Ajisaka 2017-05-12 08:48:51 -05:00
parent 1411612aa4
commit a9e24a13b7
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
2 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh
View File

@ -1457,30 +1457,6 @@ function hadoop_finalize_classpath
hadoop_translate_cygwin_path CLASSPATH true
}
## @description Finish Catalina configuration prior to execution
## @audience private
## @stability evolving
## @replaceable yes
function hadoop_finalize_catalina_opts
{
local prefix=${HADOOP_CATALINA_PREFIX}
hadoop_add_param CATALINA_OPTS hadoop.home.dir "-Dhadoop.home.dir=${HADOOP_HOME}"
if [[ -n "${JAVA_LIBRARY_PATH}" ]]; then
hadoop_add_param CATALINA_OPTS java.library.path "-Djava.library.path=${JAVA_LIBRARY_PATH}"
fi
hadoop_add_param CATALINA_OPTS "${prefix}.home.dir" "-D${prefix}.home.dir=${HADOOP_HOME}"
hadoop_add_param CATALINA_OPTS "${prefix}.config.dir" "-D${prefix}.config.dir=${HADOOP_CATALINA_CONFIG}"
hadoop_add_param CATALINA_OPTS "${prefix}.log.dir" "-D${prefix}.log.dir=${HADOOP_CATALINA_LOG}"
hadoop_add_param CATALINA_OPTS "${prefix}.temp.dir" "-D${prefix}.temp.dir=${HADOOP_CATALINA_TEMP}"
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}"
}
## @description Finish all the remaining environment settings prior
## @description to executing Java. This is a wrapper that calls
## @description the other `finalize` routines.

56
hadoop-common-project/hadoop-common/src/test/scripts/hadoop_finalize_catalina_opts.bats
View File

@ -1,56 +0,0 @@
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
load hadoop-functions_test_helper
@test "hadoop_finalize_catalina_opts (raw)" {
local j
HADOOP_IS_CYGWIN=false
HADOOP_CATALINA_PREFIX=test
CATALINA_OPTS=""
hadoop_finalize_catalina_opts
for j in test.home.dir \
test.config.dir \
test.log.dir \
test.admin.port \
test.http.port \
test.max.threads \
test.ssl.keystore.file; do
[ "${CATALINA_OPTS#*${j}}" != "${CATALINA_OPTS}" ]
done
}
@test "hadoop_finalize_catalina_opts (cygwin)" {
local j
skip "catalina commands not supported under cygwin yet"
HADOOP_IS_CYGWIN=true
HADOOP_CATALINA_PREFIX=test
CATALINA_OPTS=""
catalina_translate_cygwin_path () {
eval ${1}="foobarbaz"
}
hadoop_finalize_catalina_opts
for j in test.home.dir \
test.config.dir \
test.log.dir \
test.ssl.keystore.file; do
[ "${CATALINA_OPTS#*${j}=foobarbaz}" != "${CATALINA_OPTS}" ]
done
}