Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AB1909592 for ; Thu, 29 Mar 2012 15:38:29 +0000 (UTC) Received: (qmail 54697 invoked by uid 500); 29 Mar 2012 15:38:29 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 54681 invoked by uid 500); 29 Mar 2012 15:38:29 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 54673 invoked by uid 99); 29 Mar 2012 15:38:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Mar 2012 15:38:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Mar 2012 15:38:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 582F023889E1 for ; Thu, 29 Mar 2012 15:38:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1306928 - in /accumulo/trunk: ./ bin/start-server.sh Date: Thu, 29 Mar 2012 15:38:06 -0000 To: commits@accumulo.apache.org From: vines@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120329153806.582F023889E1@eris.apache.org> 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"