accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [5/9] git commit: ACCUMULO-1901 treat the gc start/stop like the redundant masters
Date Tue, 19 Nov 2013 17:14:57 GMT
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/6f07d7aa
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6f07d7aa
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6f07d7aa

Branch: refs/heads/master
Commit: 6f07d7aaacaa93ce8dbcb1747bc1bccdfade008b
Parents: bf8c90a
Author: Eric Newton <eric.newton@gmail.com>
Authored: Tue Nov 19 11:31:38 2013 -0500
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Tue Nov 19 11:31:38 2013 -0500

----------------------------------------------------------------------
 bin/config.sh     | 5 -----
 bin/start-all.sh  | 4 +++-
 bin/start-here.sh | 4 ++--
 bin/stop-all.sh   | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/config.sh
----------------------------------------------------------------------
diff --git a/bin/config.sh b/bin/config.sh
index 5f560e3..d43f4af 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
 #  HADOOP_HOME        Home dir for hadoop.  TODO fix this.
@@ -95,11 +94,7 @@ fi
 export HADOOP_PREFIX
 
 MASTER1=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters" | head -1)
-GC=$MASTER1
 MONITOR=$MASTER1
-if [ -f "$ACCUMULO_CONF_DIR/gc" ]; then
-   GC=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/gc" | head -1)
-fi
 if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
    MONITOR=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/monitor" | head -1)
 fi

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/start-all.sh
----------------------------------------------------------------------
diff --git a/bin/start-all.sh b/bin/start-all.sh
index 8470a40..5b15d86 100755
--- a/bin/start-all.sh
+++ b/bin/start-all.sh
@@ -58,7 +58,9 @@ for master in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters"`; do
    ${bin}/start-server.sh $master master
 done
 
-${bin}/start-server.sh $GC gc "garbage collector"
+for gc in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/gc"`; do
+   ${bin}/start-server.sh $gc gc "garbage collector"
+done
 
 for tracer in `egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/tracers"`; do
    ${bin}/start-server.sh $tracer tracer

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/start-here.sh
----------------------------------------------------------------------
diff --git a/bin/start-here.sh b/bin/start-here.sh
index 2952975..29f901d 100755
--- a/bin/start-here.sh
+++ b/bin/start-here.sh
@@ -57,8 +57,8 @@ for host in $HOSTS; do
 done
 
 for host in $HOSTS; do
-   if [ ${host} = "${GC}" ]; then
-      ${bin}/start-server.sh $GC gc "garbage collector"
+   if grep -q "^${host}\$" $ACCUMULO_CONF_DIR/gc; then
+      ${bin}/start-server.sh $host gc "garbage collector"
       break
    fi
 done

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6f07d7aa/bin/stop-all.sh
----------------------------------------------------------------------
diff --git a/bin/stop-all.sh b/bin/stop-all.sh
index 348d067..bf5b20d 100755
--- a/bin/stop-all.sh
+++ b/bin/stop-all.sh
@@ -45,10 +45,12 @@ sleep 5
 #look for master and gc processes not killed by 'admin stopAll'
 for signal in TERM KILL ; do
    for master in `grep -v '^#' "$ACCUMULO_CONF_DIR/masters"`; do
-      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/lib/accumulo-start.jar" master $signal
+      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/lib/accumulo-start.*.jar" master $signal
    done
 
-   ${bin}/stop-server.sh "$GC" "$ACCUMULO_HOME/lib/accumulo-start.jar" gc $signal
+   for gc in `grep -v '^#' "$ACCUMULO_CONF_DIR/gc"`; do
+      ${bin}/stop-server.sh "$gc" "$ACCUMULO_HOME/lib/accumulo-start.*.jar" gc $signal
+   done
 
    ${bin}/stop-server.sh "$MONITOR" "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
 


Mime
View raw message