You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/03/29 17:38:06 UTC
svn commit: r1306928 - in /accumulo/trunk: ./ bin/start-server.sh
Author: vines
Date: Thu Mar 29 15:38:05 2012
New Revision: 1306928
URL: http://svn.apache.org/viewvc?rev=1306928&view=rev
Log:
merging partial fix for ACCUMULO-503
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/bin/start-server.sh
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4:r1306908
Modified: accumulo/trunk/bin/start-server.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/start-server.sh?rev=1306928&r1=1306927&r2=1306928&view=diff
==============================================================================
--- accumulo/trunk/bin/start-server.sh (original)
+++ accumulo/trunk/bin/start-server.sh Thu Mar 29 15:38:05 2012
@@ -37,7 +37,11 @@ then
fi
SLAVES=`wc -l < ${ACCUMULO_HOME}/conf/slaves`
-PID=`$SSH $HOST ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main $SERVICE" | grep -v grep | awk {'print $2'} | head -1`
+if [ $HOST == localhost ]
+ PID=`ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main $SERVICE" | grep -v grep | awk {'print $2'} | head -1`
+else
+ PID=`$SSH $HOST ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main $SERVICE" | grep -v grep | awk {'print $2'} | head -1`
+fi
if [ -z $PID ]; then
echo "Starting $LONGNAME on $HOST"