You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bh...@apache.org on 2014/01/30 17:22:45 UTC
[01/10] git commit: ACCUMULO-2285 Default to MASTER1 if tracers or gc
file is missing (1.4.x)
Updated Branches:
refs/heads/1.4.5-SNAPSHOT d362d16ac -> 9bff89fc2
refs/heads/1.5.1-SNAPSHOT be26f7916 -> 688d4e476
refs/heads/1.6.0-SNAPSHOT 3751c67c3 -> 49457839a
refs/heads/master f115f1979 -> cac5e121b
ACCUMULO-2285 Default to MASTER1 if tracers or gc file is missing (1.4.x)
The start-all.sh script defaults to starting tracer and gc processes on the first
master if the tracers and gc files are missing from ACCUMULO_CONF_DIR. This change
adds that default behavior to stop-all.sh, which otherwise does not stop the
processes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9bff89fc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9bff89fc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9bff89fc
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 9bff89fc29b728607aaf1b6f8dcb2cc8ef171313
Parents: d362d16
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 09:45:05 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 09:45:05 2014 -0500
----------------------------------------------------------------------
bin/stop-all.sh | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9bff89fc/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index 4afc36a..14dfc7d 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -42,14 +42,24 @@ do
${bin}/stop-server.sh $master "$ACCUMULO_HOME/.*/accumulo-start.*.jar" master $signal
done
- for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+ if [[ -r $ACCUMULO_CONF_DIR/gc ]]; then
+ GC=`grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+ else
+ GC=$MASTER1
+ fi
+ for gc in $GC
do
${bin}/stop-server.sh $gc "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal
done
${bin}/stop-server.sh $MONITOR "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
- for tracer in `grep -v '^#' "$ACCUMULO_CONF_DIR/tracers"`
+ if [[ -r $ACCUMULO_CONF_DIR/tracers ]]; then
+ TRACERS=`grep -v '^#' "$ACCUMULO_CONF_DIR/tracers"`
+ else
+ TRACERS=$MASTER1
+ fi
+ for tracer in $TRACERS
do
${bin}/stop-server.sh $tracer "$ACCUMULO_HOME/.*/accumulo-start.*.jar" tracer $signal
done
[03/10] git commit: ACCUMULO-2285 Default to MASTER1 if tracers or gc
file is missing (1.4.x)
Posted by bh...@apache.org.
ACCUMULO-2285 Default to MASTER1 if tracers or gc file is missing (1.4.x)
The start-all.sh script defaults to starting tracer and gc processes on the first
master if the tracers and gc files are missing from ACCUMULO_CONF_DIR. This change
adds that default behavior to stop-all.sh, which otherwise does not stop the
processes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9bff89fc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9bff89fc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9bff89fc
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 9bff89fc29b728607aaf1b6f8dcb2cc8ef171313
Parents: d362d16
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 09:45:05 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 09:45:05 2014 -0500
----------------------------------------------------------------------
bin/stop-all.sh | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9bff89fc/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index 4afc36a..14dfc7d 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -42,14 +42,24 @@ do
${bin}/stop-server.sh $master "$ACCUMULO_HOME/.*/accumulo-start.*.jar" master $signal
done
- for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+ if [[ -r $ACCUMULO_CONF_DIR/gc ]]; then
+ GC=`grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+ else
+ GC=$MASTER1
+ fi
+ for gc in $GC
do
${bin}/stop-server.sh $gc "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal
done
${bin}/stop-server.sh $MONITOR "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
- for tracer in `grep -v '^#' "$ACCUMULO_CONF_DIR/tracers"`
+ if [[ -r $ACCUMULO_CONF_DIR/tracers ]]; then
+ TRACERS=`grep -v '^#' "$ACCUMULO_CONF_DIR/tracers"`
+ else
+ TRACERS=$MASTER1
+ fi
+ for tracer in $TRACERS
do
${bin}/stop-server.sh $tracer "$ACCUMULO_HOME/.*/accumulo-start.*.jar" tracer $signal
done
[09/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by bh...@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/49457839
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/49457839
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/49457839
Branch: refs/heads/master
Commit: 49457839ac7b57930b953d46be18a8a4c2271036
Parents: 3751c67 688d4e4
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 11:22:27 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 11:22:27 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/10] git commit: ACCUMULO-2285 Default to MASTER1 if tracers or gc
file is missing (1.4.x)
Posted by bh...@apache.org.
ACCUMULO-2285 Default to MASTER1 if tracers or gc file is missing (1.4.x)
The start-all.sh script defaults to starting tracer and gc processes on the first
master if the tracers and gc files are missing from ACCUMULO_CONF_DIR. This change
adds that default behavior to stop-all.sh, which otherwise does not stop the
processes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9bff89fc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9bff89fc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9bff89fc
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 9bff89fc29b728607aaf1b6f8dcb2cc8ef171313
Parents: d362d16
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 09:45:05 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 09:45:05 2014 -0500
----------------------------------------------------------------------
bin/stop-all.sh | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9bff89fc/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index 4afc36a..14dfc7d 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -42,14 +42,24 @@ do
${bin}/stop-server.sh $master "$ACCUMULO_HOME/.*/accumulo-start.*.jar" master $signal
done
- for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+ if [[ -r $ACCUMULO_CONF_DIR/gc ]]; then
+ GC=`grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+ else
+ GC=$MASTER1
+ fi
+ for gc in $GC
do
${bin}/stop-server.sh $gc "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal
done
${bin}/stop-server.sh $MONITOR "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
- for tracer in `grep -v '^#' "$ACCUMULO_CONF_DIR/tracers"`
+ if [[ -r $ACCUMULO_CONF_DIR/tracers ]]; then
+ TRACERS=`grep -v '^#' "$ACCUMULO_CONF_DIR/tracers"`
+ else
+ TRACERS=$MASTER1
+ fi
+ for tracer in $TRACERS
do
${bin}/stop-server.sh $tracer "$ACCUMULO_HOME/.*/accumulo-start.*.jar" tracer $signal
done
[05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by bh...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/688d4e47
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/688d4e47
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/688d4e47
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 688d4e476181bfd4d93f44fea0bfd663ea13da75
Parents: be26f79 9bff89f
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 11:21:59 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 11:21:59 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by bh...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/688d4e47
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/688d4e47
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/688d4e47
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 688d4e476181bfd4d93f44fea0bfd663ea13da75
Parents: be26f79 9bff89f
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 11:21:59 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 11:21:59 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/10] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by bh...@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/49457839
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/49457839
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/49457839
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 49457839ac7b57930b953d46be18a8a4c2271036
Parents: 3751c67 688d4e4
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 11:22:27 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 11:22:27 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/10] git commit: ACCUMULO-2285 Default to MASTER1 if tracers or gc
file is missing (1.4.x)
Posted by bh...@apache.org.
ACCUMULO-2285 Default to MASTER1 if tracers or gc file is missing (1.4.x)
The start-all.sh script defaults to starting tracer and gc processes on the first
master if the tracers and gc files are missing from ACCUMULO_CONF_DIR. This change
adds that default behavior to stop-all.sh, which otherwise does not stop the
processes.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9bff89fc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9bff89fc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9bff89fc
Branch: refs/heads/master
Commit: 9bff89fc29b728607aaf1b6f8dcb2cc8ef171313
Parents: d362d16
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 09:45:05 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 09:45:05 2014 -0500
----------------------------------------------------------------------
bin/stop-all.sh | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9bff89fc/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index 4afc36a..14dfc7d 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -42,14 +42,24 @@ do
${bin}/stop-server.sh $master "$ACCUMULO_HOME/.*/accumulo-start.*.jar" master $signal
done
- for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+ if [[ -r $ACCUMULO_CONF_DIR/gc ]]; then
+ GC=`grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`
+ else
+ GC=$MASTER1
+ fi
+ for gc in $GC
do
${bin}/stop-server.sh $gc "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal
done
${bin}/stop-server.sh $MONITOR "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
- for tracer in `grep -v '^#' "$ACCUMULO_CONF_DIR/tracers"`
+ if [[ -r $ACCUMULO_CONF_DIR/tracers ]]; then
+ TRACERS=`grep -v '^#' "$ACCUMULO_CONF_DIR/tracers"`
+ else
+ TRACERS=$MASTER1
+ fi
+ for tracer in $TRACERS
do
${bin}/stop-server.sh $tracer "$ACCUMULO_HOME/.*/accumulo-start.*.jar" tracer $signal
done
[07/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
(-sours)
Posted by bh...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/688d4e47
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/688d4e47
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/688d4e47
Branch: refs/heads/master
Commit: 688d4e476181bfd4d93f44fea0bfd663ea13da75
Parents: be26f79 9bff89f
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 11:21:59 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 11:21:59 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by bh...@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/cac5e121
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cac5e121
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cac5e121
Branch: refs/heads/master
Commit: cac5e121b8e8fae2e06f756077cb44549d211504
Parents: f115f19 4945783
Author: Bill Havanki <bh...@cloudera.com>
Authored: Thu Jan 30 11:22:38 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Thu Jan 30 11:22:38 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------