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/12/04 23:17:30 UTC
[01/10] git commit: ACCUMULO-1785 adds ACCUMULO_VERIFY_ONLY mode to
bin/config.sh.
Updated Branches:
refs/heads/master 0cecf0327 -> c29df8ef0
ACCUMULO-1785 adds ACCUMULO_VERIFY_ONLY mode to bin/config.sh.
* When set, won't write to local filesystem
- skips mkdir for ACCUMULO_LOG_DIR
- skips standalone mode checks
- skips writing to missing tracers file
* Other behavior changes
- if GC was set, we won't overwrite it
- if MONITOR was set, we won't overwrite it
Signed-off-by: Keith Turner <kt...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a7d981b3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a7d981b3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a7d981b3
Branch: refs/heads/master
Commit: a7d981b3759f16c094f7932a3cdc67e76813d85f
Parents: a3a8895
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Thu Oct 17 16:03:49 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Dec 4 14:17:59 2013 -0500
----------------------------------------------------------------------
bin/config.sh | 131 ++++++++++++++++++++++++++++++++---------------------
1 file changed, 80 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a7d981b3/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 08a8bbd..0165a2d 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -17,35 +17,48 @@
# Guarantees that Accumulo and its environment variables are set.
#
+# Parameters checked by script
+# ACCUMULO_VERIFY_ONLY set to skip actions that would alter the local filesystem
+#
# Values set by script that can be user provided. If not provided script attempts to infer.
# ACCUMULO_CONF_DIR Location where accumulo-env.sh, accumulo-site.xml and friends will be read from
# ACCUMULO_HOME Home directory for Accumulo
# ACCUMULO_LOG_DIR Directory for Accumulo daemon logs
# ACCUMULO_VERSION Accumulo version name
# HADOOP_HOME Home dir for hadoop.
-#
+# MONITOR Machine to run monitor daemon on. Used by start-here.sh script
+#
# Values always set by script.
# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847)
-# MONITOR Machine to run monitor daemon on. Used by start-here.sh script
+#
+# Iff ACCUMULO_VERIFY_ONLY is not set, this script will
+# * Check for standalone mode (lack of masters and slaves files)
+# - Do appropriate set up
+# * Ensure the existence of ACCUMULO_LOG_DIR on the current host
+# * Ensure the presense of local role files (masters, slaves, gc, tracers)
+#
+# Values always set by script.
# SSH Default ssh parameters used to start daemons
-this="$0"
-while [ -h "$this" ]; do
- ls=`ls -ld "$this"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- this="$link"
- else
- this=`dirname "$this"`/"$link"
- fi
-done
-bin=`dirname "$this"`
-script=`basename "$this"`
-bin=`cd "$bin"; pwd`
-this="$bin/$script"
+if [ -z "${ACCUMULO_HOME}" ] ; then
+ this="$0"
+ while [ -h "$this" ]; do
+ ls=`ls -ld "$this"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ this="$link"
+ else
+ this=`dirname "$this"`/"$link"
+ fi
+ done
+ bin=`dirname "$this"`
+ script=`basename "$this"`
+ bin=`cd "$bin"; pwd`
+ this="$bin/$script"
-ACCUMULO_HOME=`dirname "$this"`/..
-export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
+ ACCUMULO_HOME=`dirname "$this"`/..
+ export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
+fi
ACCUMULO_CONF_DIR="${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}"
export ACCUMULO_CONF_DIR
@@ -64,7 +77,9 @@ if [ -z ${ACCUMULO_LOG_DIR} ]; then
ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
fi
-mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
+if [ -z "${ACCUMULO_VERIFY_ONLY}" ] ; then
+ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
+fi
export ACCUMULO_LOG_DIR
@@ -90,43 +105,57 @@ then
fi
export HADOOP_PREFIX
-if [ ! -f "$ACCUMULO_CONF_DIR/masters" -o ! -f "$ACCUMULO_CONF_DIR/slaves" ]
-then
- if [ ! -f "$ACCUMULO_CONF_DIR/masters" -a ! -f "$ACCUMULO_CONF_DIR/slaves" ]
- then
- echo "STANDALONE: Missing both conf/masters and conf/slaves files"
- echo "STANDALONE: Assuming single-node (localhost only) instance"
- echo "STANDALONE: echo "`hostname`" > $ACCUMULO_CONF_DIR/masters"
- echo `hostname` > "$ACCUMULO_CONF_DIR/masters"
- echo "STANDALONE: echo "`hostname`" > $ACCUMULO_CONF_DIR/slaves"
- echo `hostname` > "$ACCUMULO_CONF_DIR/slaves"
- fgrep -s logger.dir.walog "$ACCUMULO_CONF_DIR/accumulo-site.xml" > /dev/null
- WALOG_CONFIGURED=$?
- if [ $WALOG_CONFIGURED -ne 0 -a ! -e "$ACCUMULO_HOME/walogs" ]
- then
- echo "STANDALONE: Creating default local write-ahead log directory"
- mkdir "$ACCUMULO_HOME/walogs"
- echo "STANDALONE: mkdir \"$ACCUMULO_HOME/walogs\""
- fi
- if [ ! -e "$ACCUMULO_CONF_DIR/accumulo-metrics.xml" ]
- then
- echo "STANDALONE: Creating default metrics configuration"
- cp "$ACCUMULO_CONF_DIR/accumulo-metrics.xml.example" "$ACCUMULO_CONF_DIR/accumulo-metrics.xml"
- fi
- else
- echo "You are missing either $ACCUMULO_CONF_DIR/masters or $ACCUMULO_CONF_DIR/slaves"
- echo "Please configure them both for a multi-node instance, or delete them both for a single-node (localhost only) instance"
- exit 1
- fi
+if [ -z "${ACCUMULO_VERIFY_ONLY}" ] ; then
+ if [ ! -f "$ACCUMULO_CONF_DIR/masters" -o ! -f "$ACCUMULO_CONF_DIR/slaves" ]
+ then
+ if [ ! -f "$ACCUMULO_CONF_DIR/masters" -a ! -f "$ACCUMULO_CONF_DIR/slaves" ]
+ then
+ echo "STANDALONE: Missing both conf/masters and conf/slaves files"
+ echo "STANDALONE: Assuming single-node (localhost only) instance"
+ echo "STANDALONE: echo "`hostname`" > $ACCUMULO_CONF_DIR/masters"
+ echo `hostname` > "$ACCUMULO_CONF_DIR/masters"
+ echo "STANDALONE: echo "`hostname`" > $ACCUMULO_CONF_DIR/slaves"
+ echo `hostname` > "$ACCUMULO_CONF_DIR/slaves"
+ fgrep -s logger.dir.walog "$ACCUMULO_CONF_DIR/accumulo-site.xml" > /dev/null
+ WALOG_CONFIGURED=$?
+ if [ $WALOG_CONFIGURED -ne 0 -a ! -e "$ACCUMULO_HOME/walogs" ]
+ then
+ echo "STANDALONE: Creating default local write-ahead log directory"
+ mkdir "$ACCUMULO_HOME/walogs"
+ echo "STANDALONE: mkdir \"$ACCUMULO_HOME/walogs\""
+ fi
+ if [ ! -e "$ACCUMULO_CONF_DIR/accumulo-metrics.xml" ]
+ then
+ echo "STANDALONE: Creating default metrics configuration"
+ cp "$ACCUMULO_CONF_DIR/accumulo-metrics.xml.example" "$ACCUMULO_CONF_DIR/accumulo-metrics.xml"
+ fi
+ else
+ echo "You are missing either $ACCUMULO_CONF_DIR/masters or $ACCUMULO_CONF_DIR/slaves"
+ echo "Please configure them both for a multi-node instance, or delete them both for a single-node (localhost only) instance"
+ exit 1
+ fi
+ fi
fi
MASTER1=`grep -v '^#' "$ACCUMULO_CONF_DIR/masters" | head -1`
-MONITOR=$MASTER1
-if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
- MONITOR=`grep -v '^#' "$ACCUMULO_CONF_DIR/monitor" | head -1`
+if [ -z "${MONITOR}" ] ; then
+ MONITOR=$MASTER1
+ if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
+ MONITOR=`grep -v '^#' "$ACCUMULO_CONF_DIR/monitor" | head -1`
+ fi
+ if [ -z "${MONITOR}" ] ; then
+ echo "Could not infer a Monitor role. You need to either define the MONITOR env variable, define \"${ACCUMULO_CONF_DIR}/monitor\", or make sure \"${ACCUMULO_CONF_DIR}/masters\" is non-empty."
+ exit 1
+ fi
fi
-if [ ! -f "$ACCUMULO_CONF_DIR/tracers" ]; then
+if [ ! -f "$ACCUMULO_CONF_DIR/tracers" -a -z "${ACCUMULO_VERIFY_ONLY}" ]; then
+ if [ -z "${MASTER1}" ] ; then
+ echo "Could not find a master node to use as a default for the tracer role. Either set up \"${ACCUMULO_CONF_DIR}/tracers\" or make sure \"${ACCUMULO_CONF_DIR}/masters\" is non-empty."
+ exit 1
+ else
echo "$MASTER1" > "$ACCUMULO_CONF_DIR/tracers"
+ fi
fi
+
SSH='ssh -qnf -o ConnectTimeout=2'
# See HADOOP-7154 and ACCUMULO-847
[09/10] 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/c45b96c0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c45b96c0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c45b96c0
Branch: refs/heads/master
Commit: c45b96c040a9ce55963b32dda0c31a2677240401
Parents: 4deaf92 c1fa557
Author: Eric Newton <er...@gmail.com>
Authored: Wed Dec 4 17:15:34 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Dec 4 17:15:34 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/10] 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/13759eff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13759eff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/13759eff
Branch: refs/heads/master
Commit: 13759eff645d7074e0c85c0711f6f11e873daa66
Parents: b07d129 db1cc47
Author: Keith Turner <kt...@apache.org>
Authored: Wed Dec 4 14:53:43 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Dec 4 14:53:43 2013 -0500
----------------------------------------------------------------------
bin/config.sh | 67 ++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 47 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/13759eff/bin/config.sh
----------------------------------------------------------------------
[08/10] 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
Conflicts:
src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c1fa5573
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c1fa5573
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c1fa5573
Branch: refs/heads/master
Commit: c1fa5573c63b42f35b21e960a8d75b1a7bfa77bb
Parents: cbb4219 36561a0
Author: Eric Newton <er...@gmail.com>
Authored: Wed Dec 4 17:15:15 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Dec 4 17:15:15 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/10] git commit: ACCUMULO-1790 found a missing config item,
and behavior change
Posted by ec...@apache.org.
ACCUMULO-1790 found a missing config item, and behavior change
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/36561a0e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/36561a0e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/36561a0e
Branch: refs/heads/master
Commit: 36561a0e0384bd295fccd2b48364a080b74851bb
Parents: b693168
Author: Eric Newton <er...@gmail.com>
Authored: Wed Dec 4 16:51:47 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Dec 4 17:08:59 2013 -0500
----------------------------------------------------------------------
conf/examples/1GB/native-standalone/accumulo-site.xml | 1 +
conf/examples/1GB/standalone/accumulo-site.xml | 1 +
conf/examples/3GB/native-standalone/accumulo-site.xml | 1 +
conf/examples/3GB/standalone/accumulo-site.xml | 1 +
.../examples/512MB/native-standalone/accumulo-site.xml | 1 +
conf/examples/512MB/standalone/accumulo-site.xml | 1 +
.../accumulo/server/master/CoordinateRecoveryTask.java | 13 ++++++++-----
7 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/native-standalone/accumulo-site.xml b/conf/examples/1GB/native-standalone/accumulo-site.xml
index e995bfe..3f21599 100644
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@ -100,6 +100,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/1GB/standalone/accumulo-site.xml b/conf/examples/1GB/standalone/accumulo-site.xml
index cf081a7..f477092 100644
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@ -95,6 +95,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/native-standalone/accumulo-site.xml b/conf/examples/3GB/native-standalone/accumulo-site.xml
index 5709556..6730955 100644
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@ -85,6 +85,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/3GB/standalone/accumulo-site.xml b/conf/examples/3GB/standalone/accumulo-site.xml
index 5709556..6730955 100644
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@ -85,6 +85,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/native-standalone/accumulo-site.xml b/conf/examples/512MB/native-standalone/accumulo-site.xml
index 7f7d88d..f241f4c 100644
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@ -95,6 +95,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --git a/conf/examples/512MB/standalone/accumulo-site.xml b/conf/examples/512MB/standalone/accumulo-site.xml
index 99a5153..b51014e 100644
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@ -95,6 +95,7 @@
$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
+ $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
-->
<value>
$ACCUMULO_HOME/src/server/target/classes/,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/36561a0e/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
index b98f29d..84e6be8 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
@@ -407,11 +407,14 @@ public class CoordinateRecoveryTask implements Runnable {
private void removeOldRecoverFiles() throws IOException {
long now = System.currentTimeMillis();
long maxAgeInMillis = ServerConfiguration.getSystemConfiguration().getTimeInMillis(Property.MASTER_RECOVERY_MAXAGE);
- FileStatus[] children = fs.listStatus(new Path(ServerConstants.getRecoveryDir()));
- if (children != null) {
- for (FileStatus child : children) {
- if (now - child.getModificationTime() > maxAgeInMillis && !delete(child.getPath())) {
- log.warn("Unable to delete old recovery directory: " + child.getPath());
+ Path recoveryDir = new Path(ServerConstants.getRecoveryDir());
+ if (fs.exists(recoveryDir)) {
+ FileStatus[] children = fs.listStatus(recoveryDir);
+ if (children != null) {
+ for (FileStatus child : children) {
+ if (now - child.getModificationTime() > maxAgeInMillis && !delete(child.getPath())) {
+ log.warn("Unable to delete old recovery directory: " + child.getPath());
+ }
}
}
}
[05/10] git commit: Merge remote-tracking branch
'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by ec...@apache.org.
Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
bin/config.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cbb42194
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cbb42194
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cbb42194
Branch: refs/heads/master
Commit: cbb42194b2caf6ae7178e7e7f4097d6035422645
Parents: db1cc47 b693168
Author: Keith Turner <kt...@apache.org>
Authored: Wed Dec 4 15:40:29 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Dec 4 15:40:29 2013 -0500
----------------------------------------------------------------------
bin/config.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cbb42194/bin/config.sh
----------------------------------------------------------------------
diff --cc bin/config.sh
index 3140119,89685fb..dca2e99
--- a/bin/config.sh
+++ b/bin/config.sh
@@@ -25,12 -25,9 +25,9 @@@
# ACCUMULO_HOME Home directory for Accumulo
# ACCUMULO_LOG_DIR Directory for Accumulo daemon logs
# ACCUMULO_VERSION Accumulo version name
-# HADOOP_HOME Home dir for hadoop.
+# HADOOP_PREFIX Prefix to the home dir for hadoop.
# MONITOR Machine to run monitor daemon on. Used by start-here.sh script
#
- # Values always set by script.
- # MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847)
- #
# Iff ACCUMULO_VERIFY_ONLY is not set, this script will
# * Check for standalone mode (lack of masters and slaves files)
# - Do appropriate set up
@@@ -39,22 -36,26 +36,23 @@@
#
# Values always set by script.
# SSH Default ssh parameters used to start daemons
+ # MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847)
+# HADOOP_HOME Home dir for hadoop. TODO fix this.
if [ -z "${ACCUMULO_HOME}" ] ; then
- this="$0"
- while [ -h "$this" ]; do
- ls=`ls -ld "$this"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- this="$link"
- else
- this=`dirname "$this"`/"$link"
- fi
+ # Start: Resolve Script Directory
+ SOURCE="${BASH_SOURCE[0]}"
+ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ SOURCE="$(readlink "$SOURCE")"
+ [[ $SOURCE != /* ]] && SOURCE="$bin/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
- bin=`dirname "$this"`
- script=`basename "$this"`
- bin=`cd "$bin"; pwd`
- this="$bin/$script"
+ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+ script=$( basename "$SOURCE" )
+ # Stop: Resolve Script Directory
- ACCUMULO_HOME=`dirname "$this"`/..
- export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
+ ACCUMULO_HOME=$( cd -P ${bin}/.. && pwd )
+ export ACCUMULO_HOME
fi
ACCUMULO_CONF_DIR="${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}"
[04/10] git commit: ACCUMULO-1785 comment was messged up when
resolving patch conflict
Posted by ec...@apache.org.
ACCUMULO-1785 comment was messged up when resolving patch conflict
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b6931683
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6931683
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b6931683
Branch: refs/heads/master
Commit: b6931683a5bab1bfba9498c83451bb3daf0a8c25
Parents: a7d981b
Author: Keith Turner <kt...@apache.org>
Authored: Wed Dec 4 15:29:57 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Dec 4 15:32:32 2013 -0500
----------------------------------------------------------------------
bin/config.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6931683/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 0165a2d..89685fb 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -28,9 +28,6 @@
# HADOOP_HOME Home dir for hadoop.
# MONITOR Machine to run monitor daemon on. Used by start-here.sh script
#
-# Values always set by script.
-# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847)
-#
# Iff ACCUMULO_VERIFY_ONLY is not set, this script will
# * Check for standalone mode (lack of masters and slaves files)
# - Do appropriate set up
@@ -39,6 +36,7 @@
#
# Values always set by script.
# SSH Default ssh parameters used to start daemons
+# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847)
if [ -z "${ACCUMULO_HOME}" ] ; then
this="$0"
[06/10] git commit: Merge remote-tracking branch
'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by ec...@apache.org.
Merge remote-tracking branch 'origin/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/4deaf92e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4deaf92e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4deaf92e
Branch: refs/heads/master
Commit: 4deaf92e51084c1216c1d188a6f91c9bc0ba269e
Parents: 13759ef cbb4219
Author: Keith Turner <kt...@apache.org>
Authored: Wed Dec 4 15:44:51 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Dec 4 15:44:51 2013 -0500
----------------------------------------------------------------------
bin/config.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4deaf92e/bin/config.sh
----------------------------------------------------------------------
[10/10] 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/c29df8ef
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c29df8ef
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c29df8ef
Branch: refs/heads/master
Commit: c29df8ef00e0d664e7e9b5f59057fd91788323e7
Parents: 0cecf03 c45b96c
Author: Eric Newton <er...@gmail.com>
Authored: Wed Dec 4 17:16:07 2013 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Dec 4 17:16:07 2013 -0500
----------------------------------------------------------------------
bin/config.sh | 67 +++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 46 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[02/10] 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
Conflicts:
bin/config.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db1cc477
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db1cc477
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/db1cc477
Branch: refs/heads/master
Commit: db1cc477cea907500df3fc196547ba66f661260a
Parents: 0817cdc a7d981b
Author: Keith Turner <kt...@apache.org>
Authored: Wed Dec 4 14:50:55 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Wed Dec 4 14:50:55 2013 -0500
----------------------------------------------------------------------
bin/config.sh | 67 ++++++++++++++++++++++++++++++++++++++----------------
1 file changed, 47 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/db1cc477/bin/config.sh
----------------------------------------------------------------------
diff --cc bin/config.sh
index d43f4af,0165a2d..3140119
--- a/bin/config.sh
+++ b/bin/config.sh
@@@ -22,27 -25,40 +25,37 @@@
# ACCUMULO_HOME Home directory for Accumulo
# ACCUMULO_LOG_DIR Directory for Accumulo daemon logs
# ACCUMULO_VERSION Accumulo version name
-# HADOOP_HOME Home dir for hadoop.
+# HADOOP_PREFIX Prefix to the home dir for hadoop.
- #
+ # MONITOR Machine to run monitor daemon on. Used by start-here.sh script
+ #
# Values always set by script.
# MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847)
- # MONITOR Machine to run monitor daemon on. Used by start-here.sh script
+ #
+ # Iff ACCUMULO_VERIFY_ONLY is not set, this script will
+ # * Check for standalone mode (lack of masters and slaves files)
+ # - Do appropriate set up
+ # * Ensure the existence of ACCUMULO_LOG_DIR on the current host
+ # * Ensure the presense of local role files (masters, slaves, gc, tracers)
+ #
+ # Values always set by script.
# SSH Default ssh parameters used to start daemons
+# HADOOP_HOME Home dir for hadoop. TODO fix this.
- # Start: Resolve Script Directory
- SOURCE="${BASH_SOURCE[0]}"
- while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
- bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
- SOURCE="$(readlink "$SOURCE")"
- [[ $SOURCE != /* ]] && SOURCE="$bin/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
- done
- bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
- script=$( basename "$SOURCE" )
- # Stop: Resolve Script Directory
+ if [ -z "${ACCUMULO_HOME}" ] ; then
- this="$0"
- while [ -h "$this" ]; do
- ls=`ls -ld "$this"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- this="$link"
- else
- this=`dirname "$this"`/"$link"
- fi
++ # Start: Resolve Script Directory
++ SOURCE="${BASH_SOURCE[0]}"
++ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
++ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
++ SOURCE="$(readlink "$SOURCE")"
++ [[ $SOURCE != /* ]] && SOURCE="$bin/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+ done
- bin=`dirname "$this"`
- script=`basename "$this"`
- bin=`cd "$bin"; pwd`
- this="$bin/$script"
++ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
++ script=$( basename "$SOURCE" )
++ # Stop: Resolve Script Directory
- ACCUMULO_HOME=$( cd -P ${bin}/.. && pwd )
- export ACCUMULO_HOME
- ACCUMULO_HOME=`dirname "$this"`/..
- export ACCUMULO_HOME=`cd $ACCUMULO_HOME; pwd`
++ ACCUMULO_HOME=$( cd -P ${bin}/.. && pwd )
++ export ACCUMULO_HOME
+ fi
ACCUMULO_CONF_DIR="${ACCUMULO_CONF_DIR:-$ACCUMULO_HOME/conf}"
export ACCUMULO_CONF_DIR
@@@ -68,10 -74,12 +81,12 @@@ elif [ -z "$ACCUMULO_TEST" ] ; the
fi
if [ -z ${ACCUMULO_LOG_DIR} ]; then
- ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
+ ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
fi
- mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
+ if [ -z "${ACCUMULO_VERIFY_ONLY}" ] ; then
+ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
+ fi
export ACCUMULO_LOG_DIR
@@@ -93,13 -105,55 +108,25 @@@ the
fi
export HADOOP_PREFIX
-if [ -z "${ACCUMULO_VERIFY_ONLY}" ] ; then
- if [ ! -f "$ACCUMULO_CONF_DIR/masters" -o ! -f "$ACCUMULO_CONF_DIR/slaves" ]
- then
- if [ ! -f "$ACCUMULO_CONF_DIR/masters" -a ! -f "$ACCUMULO_CONF_DIR/slaves" ]
- then
- echo "STANDALONE: Missing both conf/masters and conf/slaves files"
- echo "STANDALONE: Assuming single-node (localhost only) instance"
- echo "STANDALONE: echo "`hostname`" > $ACCUMULO_CONF_DIR/masters"
- echo `hostname` > "$ACCUMULO_CONF_DIR/masters"
- echo "STANDALONE: echo "`hostname`" > $ACCUMULO_CONF_DIR/slaves"
- echo `hostname` > "$ACCUMULO_CONF_DIR/slaves"
- fgrep -s logger.dir.walog "$ACCUMULO_CONF_DIR/accumulo-site.xml" > /dev/null
- WALOG_CONFIGURED=$?
- if [ $WALOG_CONFIGURED -ne 0 -a ! -e "$ACCUMULO_HOME/walogs" ]
- then
- echo "STANDALONE: Creating default local write-ahead log directory"
- mkdir "$ACCUMULO_HOME/walogs"
- echo "STANDALONE: mkdir \"$ACCUMULO_HOME/walogs\""
- fi
- if [ ! -e "$ACCUMULO_CONF_DIR/accumulo-metrics.xml" ]
- then
- echo "STANDALONE: Creating default metrics configuration"
- cp "$ACCUMULO_CONF_DIR/accumulo-metrics.xml.example" "$ACCUMULO_CONF_DIR/accumulo-metrics.xml"
- fi
- else
- echo "You are missing either $ACCUMULO_CONF_DIR/masters or $ACCUMULO_CONF_DIR/slaves"
- echo "Please configure them both for a multi-node instance, or delete them both for a single-node (localhost only) instance"
- exit 1
- fi
- fi
-fi
-MASTER1=`grep -v '^#' "$ACCUMULO_CONF_DIR/masters" | head -1`
+MASTER1=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters" | head -1)
- MONITOR=$MASTER1
- if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
- MONITOR=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/monitor" | head -1)
+ if [ -z "${MONITOR}" ] ; then
+ MONITOR=$MASTER1
+ if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
- MONITOR=`grep -v '^#' "$ACCUMULO_CONF_DIR/monitor" | head -1`
++ MONITOR=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/monitor" | head -1)
+ fi
+ if [ -z "${MONITOR}" ] ; then
+ echo "Could not infer a Monitor role. You need to either define the MONITOR env variable, define \"${ACCUMULO_CONF_DIR}/monitor\", or make sure \"${ACCUMULO_CONF_DIR}/masters\" is non-empty."
+ exit 1
+ fi
fi
- if [ ! -f "$ACCUMULO_CONF_DIR/tracers" ]; then
- echo "$MASTER1" > "$ACCUMULO_CONF_DIR/tracers"
+ if [ ! -f "$ACCUMULO_CONF_DIR/tracers" -a -z "${ACCUMULO_VERIFY_ONLY}" ]; then
+ if [ -z "${MASTER1}" ] ; then
+ echo "Could not find a master node to use as a default for the tracer role. Either set up \"${ACCUMULO_CONF_DIR}/tracers\" or make sure \"${ACCUMULO_CONF_DIR}/masters\" is non-empty."
+ exit 1
+ else
+ echo "$MASTER1" > "$ACCUMULO_CONF_DIR/tracers"
+ fi
++
fi
SSH='ssh -qnf -o ConnectTimeout=2'