Author: rvs
Date: Thu Sep 22 15:28:48 2011
New Revision: 1174205
URL: http://svn.apache.org/viewvc?rev=1174205&view=rev
Log:
BIGTOP-104. hadoop daemons can not be started because hadoop-config.sh resets
HADOOP_HOME
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse
Modified:
incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl?rev=1174205&r1=1174204&r2=1174205&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/service-init.d.tpl
Thu Sep 22 15:28:48 2011
@@ -46,13 +46,14 @@
# this directory exists.
install -d -m 0775 -o root -g hadoop /var/run/hadoop
-# Include hadoop defaults if available
-if [ -f /etc/default/hadoop ] ; then
- . /etc/default/hadoop
-fi
+. /etc/default/hadoop
. $HADOOP_HOME/bin/hadoop-config.sh
+# FIXME: this needs to be removed once hadoop-config.sh stop clobbering
HADOOP_HOME
+. /etc/default/hadoop
+
+
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON_SCRIPT=$HADOOP_HOME/bin/hadoop-daemon.sh
NAME=hadoop-@HADOOP_DAEMON@
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl?rev=1174205&r1=1174204&r2=1174205&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl
Thu Sep 22 15:28:48 2011
@@ -24,6 +24,8 @@ source /etc/rc.d/init.d/functions
source /etc/default/hadoop
source @HADOOP_COMMON_ROOT@/bin/hadoop-config.sh
+# FIXME: this needs to be removed once hadoop-config.sh stop clobbering
HADOOP_HOME
+source /etc/default/hadoop
RETVAL_SUCCESS=0
Modified:
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse?rev=1174205&r1=1174204&r2=1174205&view=diff
==============================================================================
---
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse
(original)
+++
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES/hadoop-init.tmpl.suse
Thu Sep 22 15:28:48 2011
@@ -36,6 +36,9 @@ source /etc/default/hadoop
source @HADOOP_COMMON_ROOT@/bin/hadoop-config.sh
+# FIXME: this needs to be removed once hadoop-config.sh stop clobbering
HADOOP_HOME
+source /etc/default/hadoop
+
RETVAL_SUCCESS=0
STATUS_RUNNING=0
