Author: tucu
Date: Wed Mar 14 17:03:23 2012
New Revision: 1300641
URL: http://svn.apache.org/viewvc?rev=1300641&view=rev
Log:
Merge -r 1300636:1300637 from trunk to branch. FIXES: HDFS-3057
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh?rev=1300641&r1=1300640&r2=1300641&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
Wed Mar 14 17:03:23 2012
@@ -150,6 +150,13 @@ else
print "Using CATALINA_BASE: ${CATALINA_BASE}"
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
export CATALINA_OUT=${HTTPFS_LOG}/httpfs-catalina.out
print "Setting CATALINA_OUT: ${CATALINA_OUT}"
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh?rev=1300641&r1=1300640&r2=1300641&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/sbin/httpfs.sh
Wed Mar 14 17:03:23 2012
@@ -29,7 +29,7 @@ done
BASEDIR=`dirname ${PRG}`
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,
# it is used in Tomcat's server.xml configuration file
@@ -55,8 +55,8 @@ if [ "${1}" = "stop" ]; then
fi
if [ "${HTTPFS_SILENT}" != "true" ]; then
- ${CATALINA_BASE:-"${BASEDIR}/share/hadoop/httpfs/tomcat"}/bin/catalina.sh
"$@"
+ ${HTTPFS_CATALINA_HOME}/bin/catalina.sh "$@"
else
- ${CATALINA_BASE:-"${BASEDIR}/share/hadoop/httpfs/tomcat"}/bin/catalina.sh
"$@" > /dev/null
+ ${HTTPFS_CATALINA_HOME}/bin/catalina.sh "$@" > /dev/null
fi
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1300641&r1=1300640&r2=1300641&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Wed Mar 14 17:03:23 2012
@@ -138,6 +138,9 @@ Release 0.23.3 - UNRELEASED
HDFS-3082. Clean up FSDatasetInterface and change DataNode.data to package
private. (szetszwo)
+ HDFS-3057. httpfs and hdfs launcher scripts should honor CATALINA_HOME
+ and HADOOP_LIBEXEC_DIR (rvs via tucu)
+
OPTIMIZATIONS
HDFS-2477. Optimize computing the diff between a block report and the
namenode state. (Tomasz Nykiel via hairong)
