You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2012/04/17 19:29:06 UTC

svn commit: r1327195 - /incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc

Author: rvs
Date: Tue Apr 17 17:29:06 2012
New Revision: 1327195

URL: http://svn.apache.org/viewvc?rev=1327195&view=rev
Log:
BIGTOP-537. provide a workaround for non-LSB compliant catalina.sh handling of a stop action

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc?rev=1327195&r1=1327194&r2=1327195&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/hadoop-httpfs.svc Tue Apr 17 17:29:06 2012
@@ -60,8 +60,13 @@ generate_stop() {
 cat <<'__EOT__'
 stop() {
   log_success_msg "Stopping ${DESC}: "
-  su -s /bin/bash $SVC_USER -c "${EXEC_PATH} stop $SLEEP_TIME -force"
-  RETVAL=$?
+  # FIXME: workaround for BIGTOP-537
+  if [ -s $PIDFILE ] ; then
+    su -s /bin/bash $SVC_USER -c "${EXEC_PATH} stop $SLEEP_TIME -force"
+    RETVAL=$?
+  else
+    RETVAL=$RETVAL_SUCCESS
+  fi
 
   [ $RETVAL -eq $RETVAL_SUCCESS ] && rm -f $LOCKFILE $PIDFILE
 }