Updated Branches: refs/heads/1.4.5-SNAPSHOT 32b6b6576 -> d8b4ba942 refs/heads/1.5.1-SNAPSHOT bf8c90a02 -> 6f07d7aaa refs/heads/1.6.0-SNAPSHOT 55016d776 -> 3875de367 refs/heads/master 1af632306 -> 4ba658750
ACCUMULO-1901 treat the gc start/stop like the redundant masters Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4976a935 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4976a935 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4976a935 Branch: refs/heads/1.4.5-SNAPSHOT Commit: 4976a935f2566ee648d20c3bc5381bc22edc51ec Parents: 32b6b65 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Nov 19 10:52:29 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Nov 19 10:52:29 2013 -0500 ---------------------------------------------------------------------- bin/start-here.sh | 2 +- bin/stop-all.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/4976a935/bin/start-here.sh ---------------------------------------------------------------------- diff --git a/bin/start-here.sh b/bin/start-here.sh index 22c8a04..9bc44d8 100755 --- a/bin/start-here.sh +++ b/bin/start-here.sh @@ -47,7 +47,7 @@ done for host in $HOSTS do - if [ ${host} = ${GC} ] + if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/slaves then ${bin}/start-server.sh $GC gc "garbage collector" break http://git-wip-us.apache.org/repos/asf/accumulo/blob/4976a935/bin/stop-all.sh ---------------------------------------------------------------------- diff --git a/bin/stop-all.sh b/bin/stop-all.sh index a717e42..4afc36a 100755 --- a/bin/stop-all.sh +++ b/bin/stop-all.sh @@ -42,7 +42,10 @@ do ${bin}/stop-server.sh $master "$ACCUMULO_HOME/.*/accumulo-start.*.jar" master $signal done - ${bin}/stop-server.sh $GC "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal + for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/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
