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 <bhava...@cloudera.com>
Authored: Thu Jan 30 09:45:05 2014 -0500
Committer: Bill Havanki <bhava...@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

Reply via email to