accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1307471 - in /accumulo/trunk: ./ bin/start-server.sh
Date Fri, 30 Mar 2012 15:28:55 GMT
Author: vines
Date: Fri Mar 30 15:28:55 2012
New Revision: 1307471

URL: http://svn.apache.org/viewvc?rev=1307471&view=rev
Log:
Merging ACCUMULO-503


Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/bin/start-server.sh

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4:r1307470

Modified: accumulo/trunk/bin/start-server.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/start-server.sh?rev=1307471&r1=1307470&r2=1307471&view=diff
==============================================================================
--- accumulo/trunk/bin/start-server.sh (original)
+++ accumulo/trunk/bin/start-server.sh Fri Mar 30 15:28:55 2012
@@ -37,7 +37,7 @@ then
 fi
 SLAVES=`wc -l < ${ACCUMULO_HOME}/conf/slaves`
 
-if [ $HOST == localhost ] 
+if [ $HOST == localhost -o $HOST == "`hostname`" ] 
 then
   PID=`ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main $SERVICE" | grep -v
grep | awk {'print $2'} | head -1`
 else
@@ -46,14 +46,15 @@ fi
 
 if [ -z $PID ]; then
     echo "Starting $LONGNAME on $HOST"
-    if [ $HOST == localhost ] 
+    if [ $HOST == localhost  -o $HOST == "`hostname`" ] 
     then
        ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err & 
+       MAX_FILES_OPEN=`bash -c 'ulimit -n'`
     else
-       $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &" 
+       $SSH $HOST "bash -c 'exec nohup ${bin}/accumulo ${SERVICE} --address $1 >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
+       MAX_FILES_OPEN=`$SSH $HOST "bash -c 'ulimit -n'"` 
     fi
 
-    MAX_FILES_OPEN=`$SSH $HOST "bash -c 'ulimit -n'"`
     if [ -n "$MAX_FILES_OPEN" ] && [ -n "$SLAVES" ] ; then
        if [ "$SLAVES" -gt 10 ] && [ "$MAX_FILES_OPEN" -lt 65536 ]; then
           echo "WARN : Max files open on $HOST is $MAX_FILES_OPEN, recommend 65536"



Mime
View raw message