bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1166274 - in /incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SOURCES: hadoop-init.tmpl hadoop-init.tmpl.suse
Date Wed, 07 Sep 2011 17:20:27 GMT
Author: rvs
Date: Wed Sep  7 17:20:14 2011
New Revision: 1166274

URL: http://svn.apache.org/viewvc?rev=1166274&view=rev
Log:
BIGTOP-20. hard-coded pid location in Hadoop init.d scripts

Modified:
    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/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=1166274&r1=1166273&r2=1166274&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 Wed Sep
 7 17:20:14 2011
@@ -23,6 +23,8 @@
 source /etc/rc.d/init.d/functions
 source /etc/default/hadoop
 
+source @HADOOP_COMMON_ROOT@/bin/hadoop-config.sh
+
 RETVAL_SUCCESS=0
 
 STATUS_RUNNING=0
@@ -31,7 +33,8 @@ STATUS_DEAD_AND_LOCK=2
 STATUS_NOT_RUNNING=3
 
 RETVAL=0
-PIDFILE="/var/run/hadoop/hadoop-$HADOOP_IDENT_STRING-@HADOOP_DAEMON@.pid"
+HADOOP_PID_DIR=${HADOOP_PID_DIR:-/var/run/hadoop}
+PIDFILE="$HADOOP_PID_DIR/hadoop-$HADOOP_IDENT_STRING-@HADOOP_DAEMON@.pid"
 LOCKFILE="/var/lock/subsys/hadoop-@HADOOP_DAEMON@"
 desc="Hadoop @HADOOP_DAEMON@ daemon"
 SLEEP_TIME=5

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=1166274&r1=1166273&r2=1166274&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 Wed
Sep  7 17:20:14 2011
@@ -34,6 +34,8 @@
 source /lib/lsb/init-functions
 source /etc/default/hadoop
 
+source @HADOOP_COMMON_ROOT@/bin/hadoop-config.sh 
+
 RETVAL_SUCCESS=0
 
 STATUS_RUNNING=0
@@ -49,7 +51,8 @@ ERROR_PROGRAM_NOT_CONFIGURED=6
 RETVAL=0
 EXEC_PATH=@HADOOP_COMMON_ROOT@/bin/hadoop-daemon.sh
 CONFIG_PATH="@HADOOP_CONF_DIR@"
-PIDFILE="/var/run/hadoop/hadoop-$HADOOP_IDENT_STRING-@HADOOP_DAEMON@.pid"
+HADOOP_PID_DIR=${HADOOP_PID_DIR:-/var/run/hadoop}
+PIDFILE="$HADOOP_PID_DIR/hadoop-$HADOOP_IDENT_STRING-@HADOOP_DAEMON@.pid"
 LOCKFILE="/var/lock/subsys/hadoop-@HADOOP_DAEMON@"
 desc="Hadoop @HADOOP_DAEMON@ daemon"
 USER="@HADOOP_DAEMON_USER@"



Mime
View raw message