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

HDFS-3057. httpfs and hdfs launcher scripts should honor CATALINA_HOME and HADOOP_LIBEXEC_DIR (rvs via tucu) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1300637 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2012-03-14 17:01:34 +00:00
parent 18fd4c9f7a
commit a0ee9adfd3
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
View File

@ -150,6 +150,13 @@ else
print "Using CATALINA_BASE: ${CATALINA_BASE}" print "Using CATALINA_BASE: ${CATALINA_BASE}"
fi fi
if [ "${HTTPFS_CATALINA_HOME}" = "" ]; then
export HTTPFS_CATALINA_HOME=${CATALINA_BASE}
print "Setting HTTPFS_CATALINA_HOME: ${HTTPFS_CATALINA_HOME}"
else
print "Using HTTPFS_CATALINA_HOME: ${HTTPFS_CATALINA_HOME}"
fi
if [ "${CATALINA_OUT}" = "" ]; then if [ "${CATALINA_OUT}" = "" ]; then
export CATALINA_OUT=${HTTPFS_LOG}/httpfs-catalina.out export CATALINA_OUT=${HTTPFS_LOG}/httpfs-catalina.out
print "Setting CATALINA_OUT: ${CATALINA_OUT}" print "Setting CATALINA_OUT: ${CATALINA_OUT}"

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

@ -29,7 +29,7 @@ done
BASEDIR=`dirname ${PRG}` BASEDIR=`dirname ${PRG}`
BASEDIR=`cd ${BASEDIR}/..;pwd` BASEDIR=`cd ${BASEDIR}/..;pwd`
source ${BASEDIR}/libexec/httpfs-config.sh source ${HADOOP_LIBEXEC_DIR:-${BASEDIR}/libexec}/httpfs-config.sh
# 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
@ -55,8 +55,8 @@ if [ "${1}" = "stop" ]; then
fi fi
if [ "${HTTPFS_SILENT}" != "true" ]; then if [ "${HTTPFS_SILENT}" != "true" ]; then
${CATALINA_BASE:-"${BASEDIR}/share/hadoop/httpfs/tomcat"}/bin/catalina.sh "$@" ${HTTPFS_CATALINA_HOME}/bin/catalina.sh "$@"
else else
${CATALINA_BASE:-"${BASEDIR}/share/hadoop/httpfs/tomcat"}/bin/catalina.sh "$@" > /dev/null ${HTTPFS_CATALINA_HOME}/bin/catalina.sh "$@" > /dev/null
fi fi

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -228,6 +228,9 @@ Release 0.23.3 - UNRELEASED
HDFS-3082. Clean up FSDatasetInterface and change DataNode.data to package HDFS-3082. Clean up FSDatasetInterface and change DataNode.data to package
private. (szetszwo) private. (szetszwo)
HDFS-3057. httpfs and hdfs launcher scripts should honor CATALINA_HOME
and HADOOP_LIBEXEC_DIR (rvs via tucu)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-3024. Improve performance of stringification in addStoredBlock (todd) HDFS-3024. Improve performance of stringification in addStoredBlock (todd)