You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/11/19 18:58:51 UTC
[1/8] git commit: ACCUMULO-1873 Better ZOOKEEPER_HOME check in
start-all.sh
Updated Branches:
refs/heads/master c7f4398bc -> b732722f8
ACCUMULO-1873 Better ZOOKEEPER_HOME check in start-all.sh
The script now checks that ZOOKEEPER_HOME is a directory and detects
when the search for a ZK JAR comes up empty.
Signed-off-by: Eric Newton <er...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0927eb83
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0927eb83
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0927eb83
Branch: refs/heads/master
Commit: 0927eb83067ad2f209f67ab25a7c5b9009b18000
Parents: ada4180
Author: Bill Havanki <bh...@cloudera.com>
Authored: Fri Nov 15 10:35:04 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 12:44:04 2013 -0500
----------------------------------------------------------------------
bin/start-all.sh | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0927eb83/bin/start-all.sh
----------------------------------------------------------------------
diff --git a/bin/start-all.sh b/bin/start-all.sh
index 278e7b9..4e45e4c 100755
--- a/bin/start-all.sh
+++ b/bin/start-all.sh
@@ -33,10 +33,20 @@ 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.";
[7/8] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bdfcc0e3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bdfcc0e3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bdfcc0e3
Branch: refs/heads/master
Commit: bdfcc0e3cef25dd9c6ddb9b592dd57116f34d3ad
Parents: fae812d 5221747
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 12:58:52 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 12:58:52 2013 -0500
----------------------------------------------------------------------
bin/start-all.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bdfcc0e3/bin/start-all.sh
----------------------------------------------------------------------
[6/8] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5221747d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5221747d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5221747d
Branch: refs/heads/master
Commit: 5221747de5e9cbf271450b4fb8289dc6d730c847
Parents: f2950ab e326641
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 12:58:12 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 12:58:12 2013 -0500
----------------------------------------------------------------------
bin/start-all.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5221747d/bin/start-all.sh
----------------------------------------------------------------------
[5/8] git commit: ACCUMULO-1873 follow symlinks
Posted by ec...@apache.org.
ACCUMULO-1873 follow symlinks
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e3266410
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e3266410
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e3266410
Branch: refs/heads/master
Commit: e326641039942a25114490c0291c3386c4354d73
Parents: 0927eb8
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 12:58:00 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 12:58:00 2013 -0500
----------------------------------------------------------------------
bin/start-all.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e3266410/bin/start-all.sh
----------------------------------------------------------------------
diff --git a/bin/start-all.sh b/bin/start-all.sh
index 4e45e4c..e0d4b36 100755
--- a/bin/start-all.sh
+++ b/bin/start-all.sh
@@ -39,7 +39,7 @@ if [ ! -d $ZOOKEEPER_HOME ]; then
exit 1
fi
-ZOOKEEPER_VERSION=$(find $ZOOKEEPER_HOME -maxdepth 1 -name "zookeeper-[0-9]*.jar" | head -1)
+ZOOKEEPER_VERSION=$(find -L $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."
[8/8] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b732722f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b732722f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b732722f
Branch: refs/heads/master
Commit: b732722f8a6df2ae9d3f24ebca8ac7a7a58e0d72
Parents: ee49290 bdfcc0e
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 12:59:06 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 12:59:06 2013 -0500
----------------------------------------------------------------------
bin/start-all.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/8] git commit: ACCUMULO-1873 merging patch
Posted by ec...@apache.org.
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/master
Commit: f2950ab52968ebdb405556aa544f55b79f2b7281
Parents: 487eec3 0927eb8
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 12:45:59 2013 -0500
Committer: Eric Newton <er...@gmail.com>
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
[3/8] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fae812d4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fae812d4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fae812d4
Branch: refs/heads/master
Commit: fae812d4383844157014fb7897c10dda76edc458
Parents: 3199c2a f2950ab
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 12:46:19 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 12:46:19 2013 -0500
----------------------------------------------------------------------
bin/start-all.sh | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/fae812d4/bin/start-all.sh
----------------------------------------------------------------------
[4/8] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ee492906
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ee492906
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ee492906
Branch: refs/heads/master
Commit: ee4929069eb011267e6fda124c472c14cfb06cae
Parents: c7f4398 fae812d
Author: Eric Newton <er...@gmail.com>
Authored: Tue Nov 19 12:46:35 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Tue Nov 19 12:46:35 2013 -0500
----------------------------------------------------------------------
bin/start-all.sh | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------