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

HDFS-14707. Add JAVA_LIBRARY_PATH to HTTPFS startup options in branch-2. 

Signed-off-by: Masatake Iwasaki <iwasakims@apache.org>
This commit is contained in:
Masatake Iwasaki 2019-08-07 10:56:10 +09:00
parent 670de354b3
commit 61bd868e80
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/conf/httpfs-env.sh
View File

@ -72,3 +72,9 @@
# The password of the SSL keystore if using SSL # The password of the SSL keystore if using SSL
# #
# export HTTPFS_SSL_KEYSTORE_PASS=password # export HTTPFS_SSL_KEYSTORE_PASS=password
# The full path to any native libraries that need to be loaded
# (For eg. location of natively compiled tomcat Apache portable
# runtime (APR) libraries
#
# export JAVA_LIBRARY_PATH=${HOME}/lib/native

10
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh
View File

@ -31,7 +31,14 @@ BASEDIR=`cd ${BASEDIR}/..;pwd`
HTTPFS_SILENT=${HTTPFS_SILENT:-true} HTTPFS_SILENT=${HTTPFS_SILENT:-true}
source ${HADOOP_LIBEXEC_DIR:-${BASEDIR}/libexec}/httpfs-config.sh HADOOP_LIBEXEC_DIR="${HADOOP_LIBEXEC_DIR:-${BASEDIR}/libexec}"
source ${HADOOP_LIBEXEC_DIR}/httpfs-config.sh
if [[ -z "${JAVA_LIBRARY_PATH}" ]]; then
JAVA_LIBRARY_PATH="${HADOOP_LIBEXEC_DIR}/../lib/native/"
else
JAVA_LIBRARY_PATH="${HADOOP_LIBEXEC_DIR}/../lib/native/:${JAVA_LIBRARY_PATH}"
fi
# The Java System property 'httpfs.http.port' it is not used by HttpFS, # The Java System property 'httpfs.http.port' it is not used by HttpFS,
# it is used in Tomcat's server.xml configuration file # it is used in Tomcat's server.xml configuration file
@ -40,6 +47,7 @@ print "Using CATALINA_OPTS: ${CATALINA_OPTS}"
catalina_opts="-Dproc_httpfs"; catalina_opts="-Dproc_httpfs";
catalina_opts="${catalina_opts} -Dhttpfs.log.dir=${HTTPFS_LOG}" catalina_opts="${catalina_opts} -Dhttpfs.log.dir=${HTTPFS_LOG}"
catalina_opts="${catalina_opts} -Djava.library.path=${JAVA_LIBRARY_PATH}"
print "Adding to CATALINA_OPTS: ${catalina_opts}" print "Adding to CATALINA_OPTS: ${catalina_opts}"