Author: bmahe
Date: Sat Nov 5 02:19:39 2011
New Revision: 1197870
URL: http://svn.apache.org/viewvc?rev=1197870&view=rev
Log:
Fix Hadoop 0.23 wrapper scripts
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default?rev=1197870&r1=1197869&r2=1197870&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop.default
Sat Nov 5 02:19:39 2011
@@ -14,6 +14,7 @@
# limitations under the License.
export HADOOP_HOME_WARN_SUPPRESS=true
export HADOOP_HOME=/usr/lib/hadoop
+export HADOOP_LIBEXEC_DIR=/usr/libexec
export HADOOP_NAMENODE_USER=hdfs
export HADOOP_SECONDARYNAMENODE_USER=hdfs
export HADOOP_DATANODE_USER=hdfs
@@ -23,3 +24,4 @@ export HADOOP_IDENT_STRING=hadoop
export HADOOP_PID_DIR=/var/run/hadoop
export HADOOP_LOG_DIR=/var/log/hadoop
export HADOOP_CONF_DIR=/etc/hadoop/conf
+export
HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${HADOOP_PREFIX}/*:${HADOOP_PREFIX}/lib/*"
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1197870&r1=1197869&r2=1197870&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Sat Nov 5 02:19:39 2011
@@ -149,7 +149,16 @@ for bin_wrapper in hadoop ; do
cat > $wrapper <<EOF
#!/bin/sh
-export HADOOP_HOME=$INSTALLED_HADOOP_DIR
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+. /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+. /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
+. /etc/default/hadoop
+
exec $INSTALLED_HADOOP_DIR/bin/$bin_wrapper "\$@"
EOF
chmod 755 $wrapper
