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/ffb26a25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ffb26a25 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ffb26a25 Branch: refs/heads/1.6.0-SNAPSHOT Commit: ffb26a25ffc94d28a9e1de93054ed5a8590cb943 Parents: 4976a93 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Nov 19 11:01:46 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Nov 19 11:01:46 2013 -0500 ---------------------------------------------------------------------- bin/config.sh | 5 ----- bin/start-here.sh | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/ffb26a25/bin/config.sh ---------------------------------------------------------------------- diff --git a/bin/config.sh b/bin/config.sh index 2d9e6fe..5836b46 100755 --- a/bin/config.sh +++ b/bin/config.sh @@ -26,7 +26,6 @@ # # Values always set by script. # MALLOC_ARENA_MAX To work around a memory management bug (see ACCUMULO-847) -# GC Machine to run GC daemon on. Used by start-here.sh script # MONITOR Machine to run monitor daemon on. Used by start-here.sh script # SSH Default ssh parameters used to start daemons @@ -121,11 +120,7 @@ then fi fi MASTER1=`grep -v '^#' "$ACCUMULO_CONF_DIR/masters" | head -1` -GC=$MASTER1 MONITOR=$MASTER1 -if [ -f "$ACCUMULO_CONF_DIR/gc" ]; then - GC=`grep -v '^#' "$ACCUMULO_CONF_DIR/gc" | head -1` -fi if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then MONITOR=`grep -v '^#' "$ACCUMULO_CONF_DIR/monitor" | head -1` fi http://git-wip-us.apache.org/repos/asf/accumulo/blob/ffb26a25/bin/start-here.sh ---------------------------------------------------------------------- diff --git a/bin/start-here.sh b/bin/start-here.sh index 9bc44d8..990fb1c 100755 --- a/bin/start-here.sh +++ b/bin/start-here.sh @@ -47,9 +47,9 @@ done for host in $HOSTS do - if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/slaves + if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/gc then - ${bin}/start-server.sh $GC gc "garbage collector" + ${bin}/start-server.sh $host gc "garbage collector" break fi done
