svn commit: r1227946 - in /incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop: SOURCES/yarn-init.tmpl SPECS/hadoop.spec

[bm...@apache.org]

Author: bmahe
Date: Fri Jan  6 02:54:03 2012
New Revision: 1227946

URL: http://svn.apache.org/viewvc?rev=1227946&view=rev
Log:
Fix runtime issues

Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SOURCES/yarn-init.tmpl
    incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SOURCES/yarn-init.tmpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SOURCES/yarn-init.tmpl?rev=1227946&r1=1227945&r2=1227946&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SOURCES/yarn-init.tmpl (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SOURCES/yarn-init.tmpl Fri Jan  6 02:54:03 2012
@@ -32,6 +32,7 @@
 ### END INIT INFO
 
 . /lib/lsb/init-functions
+. /etc/default/hadoop
 . /etc/default/yarn
 
 # Autodetect JAVA_HOME if not defined
@@ -61,8 +62,7 @@ ERROR_PROGRAM_NOT_CONFIGURED=6
 
 
 RETVAL=0
-EXEC_PATH=@YARN_COMMON_ROOT@/bin/yarn-daemon.sh
-CONFIG_PATH="@YARN_CONF_DIR@"
+EXEC_PATH=@YARN_COMMON_ROOT@/sbin/yarn-daemon.sh
 YARN_PID_DIR=${YARN_PID_DIR:-/var/run/yarn}
 PIDFILE="$YARN_PID_DIR/yarn-$YARN_IDENT_STRING-@YARN_DAEMON@.pid"
 LOCKFILE="/var/lock/subsys/yarn-@YARN_DAEMON@"
@@ -74,7 +74,7 @@ start() {
   [ -f $config ] || exit $ERROR_PROGRAM_NOT_CONFIGURED
   log_success_msg "Starting $desc (yarn-@YARN_DAEMON@): "
 
-  su -s /bin/bash $YARN_IDENT_STRING -c "$EXEC_PATH --config '$CONFIG_PATH' start @YARN_DAEMON@ $DAEMON_FLAGS"
+  su -s /bin/bash $YARN_IDENT_STRING -c "$EXEC_PATH --config '$YARN_CONF_DIR' start @YARN_DAEMON@ $DAEMON_FLAGS"
 
   # Some processes are slow to start
   sleep $SLEEP_TIME
@@ -87,7 +87,7 @@ start() {
 
 stop() {
   log_success_msg "Stopping $desc (yarn-@YARN_DAEMON@): "
-  start_daemon $EXEC_PATH --config "$CONFIG_PATH" stop @YARN_DAEMON@
+  start_daemon $EXEC_PATH --config "$YARN_CONF_DIR" stop @YARN_DAEMON@
   RETVAL=$?
 
   [ $RETVAL -eq $RETVAL_SUCCESS ] && rm -f $LOCKFILE $PIDFILE

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1227946&r1=1227945&r2=1227946&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Fri Jan  6 02:54:03 2012
@@ -321,7 +321,7 @@ do
        %__cp $yarn_orig_init_file $init_file
        %__sed -i -e 's|@YARN_COMMON_ROOT@|%{lib_hadoop}|' $init_file
        %__sed -i -e "s|@YARN_DAEMON@|${service}|" $init_file
-       %__sed -i -e 's|@YARN_CONF_DIR@|%{config_yarn}|' $init_file
+       %__sed -i -e 's|@YARN_CONF_DIR@|%{config_hadoop}|' $init_file
        %__sed -i -e 's|@YARN_DAEMON_USER@|yarn|' $init_file
        chmod 755 $init_file
 done