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 77F0210575 for ; Tue, 19 Nov 2013 17:59:15 +0000 (UTC) Received: (qmail 25283 invoked by uid 500); 19 Nov 2013 17:59:08 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 25002 invoked by uid 500); 19 Nov 2013 17:59:05 -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 24799 invoked by uid 99); 19 Nov 2013 17:58:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Nov 2013 17:58:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 11FFE88024A; Tue, 19 Nov 2013 17:58:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Tue, 19 Nov 2013 17:59:00 -0000 Message-Id: <663439d1f7dc4763a30f38f774dd82f8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/12] git commit: ACCUMULO-1873 merging patch ACCUMULO-1873 merging patch Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f2950ab5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f2950ab5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f2950ab5 Branch: refs/heads/1.5.1-SNAPSHOT Commit: f2950ab52968ebdb405556aa544f55b79f2b7281 Parents: 487eec3 0927eb8 Author: Eric Newton Authored: Tue Nov 19 12:45:59 2013 -0500 Committer: Eric Newton Committed: Tue Nov 19 12:45:59 2013 -0500 ---------------------------------------------------------------------- bin/start-all.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/f2950ab5/bin/start-all.sh ---------------------------------------------------------------------- diff --cc bin/start-all.sh index 5b15d86,4e45e4c..20e0728 --- a/bin/start-all.sh +++ b/bin/start-all.sh @@@ -29,28 -23,37 +29,38 @@@ bin="$( cd -P "$( dirname "$SOURCE" )" unset DISPLAY if [ ! -f $ACCUMULO_CONF_DIR/accumulo-env.sh ] ; then - echo "${ACCUMULO_CONF_DIR}/accumulo-env.sh does not exist. Please make sure you configure Accumulo before you run anything" - echo "We provide examples you can copy in ${ACCUMULO_HOME}/conf/examples/ which are set up for your memory footprint" - exit 1 + echo "${ACCUMULO_CONF_DIR}/accumulo-env.sh does not exist. Please make sure you configure Accumulo before you run anything" + echo "We provide examples you can copy in ${ACCUMULO_HOME}/conf/examples/ which are set up for your memory footprint" + exit 1 fi - -if [ -z $ZOOKEEPER_HOME ] ; then - echo "ZOOKEEPER_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh" - exit 1 +if [ -z "$ZOOKEEPER_HOME" ] ; then + echo "ZOOKEEPER_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh" + exit 1 fi + if [ ! -d $ZOOKEEPER_HOME ]; then + echo "ZOOKEEPER_HOME is not a directory: $ZOOKEEPER_HOME" + echo "Please check the setting, either globally or in accumulo-env.sh." + exit 1 + fi - ZOOKEEPER_VERSION=$(cd $ZOOKEEPER_HOME && ls zookeeper-[0-9]*.jar | head -1) - ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION/zookeeper-/} - ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION/.jar/} + ZOOKEEPER_VERSION=$(find $ZOOKEEPER_HOME -maxdepth 1 -name "zookeeper-[0-9]*.jar" | head -1) + if [ -z "$ZOOKEEPER_VERSION" ]; then + echo "A Zookeeper JAR was not found in $ZOOKEEPER_HOME." + echo "Please check ZOOKEEPER_HOME, either globally or in accumulo-env.sh." + exit 1 + fi + ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION##$ZOOKEEPER_HOME/zookeeper-} + ZOOKEEPER_VERSION=${ZOOKEEPER_VERSION%%.jar} -if [ "$ZOOKEEPER_VERSION" '<' "3.3.0" ] ; then - echo "WARN : Using Zookeeper $ZOOKEEPER_VERSION. Use version 3.3.0 or greater to avoid zookeeper deadlock bug."; +if [ "$ZOOKEEPER_VERSION" '<' "3.3.0" ]; then + echo "WARN : Using Zookeeper $ZOOKEEPER_VERSION. Use version 3.3.0 or greater to avoid zookeeper deadlock bug."; fi -if [ "$1" != "--notSlaves" ] ; then - ${bin}/tup.sh +${bin}/start-server.sh $MONITOR monitor + +if [ "$1" != "--notSlaves" ]; then + ${bin}/tup.sh fi ${bin}/accumulo org.apache.accumulo.server.master.state.SetGoalState NORMAL