ACCUMULO-1698 Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
bin/stop-here.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cd135831
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cd135831
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cd135831
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: cd135831c5c4005129c652384cfdd3711c4b2f64
Parents: 9af0b9d ac4a027
Author: Josh Elser <elserj@apache.org>
Authored: Tue Sep 10 21:26:34 2013 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Sep 10 21:26:34 2013 -0400
----------------------------------------------------------------------
bin/stop-here.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cd135831/bin/stop-here.sh
----------------------------------------------------------------------
diff --cc bin/stop-here.sh
index 8a3b513,315bbc6..d539b68
--- a/bin/stop-here.sh
+++ b/bin/stop-here.sh
@@@ -31,24 -24,29 +31,24 @@@ bin="$( cd -P "$( dirname "$SOURCE" )"
. "$bin"/config.sh
-ACCUMULO="$ACCUMULO_HOME/.*/accumulo-start.*.jar"
+ACCUMULO="$ACCUMULO_HOME/lib/accumulo-start.jar"
-if grep -q localhost $ACCUMULO_CONF_DIR/slaves
-then
- $bin/accumulo admin stop localhost
+if egrep -q localhost\|127.0.0.1 $ACCUMULO_CONF_DIR/slaves; then
+ $bin/accumulo admin stop localhost
else
- for host in `hostname -a`; do
- for host in "`hostname -a` `hostname`"
- do
- if grep -q $host $ACCUMULO_CONF_DIR/slaves
- then
- $bin/accumulo admin stop $host
- fi
- done
++ for host in "`hostname -a` `hostname`"; do
+ if grep -q ${host} $ACCUMULO_CONF_DIR/slaves; then
+ ${bin}/accumulo admin stop $host
+ fi
+ done
fi
-for signal in TERM KILL
-do
- for svc in tserver gc master monitor logger tracer
- do
- PID=`ps -ef | egrep ${ACCUMULO} | grep "Main $svc" | grep -v grep | grep -v stop-here.sh
| awk {'print \$2'} | head -1`
- if [ ! -z $PID ]; then
- echo "stopping $svc on `hostname -a | head -1` with signal $signal"
- kill -s ${signal} ${PID}
- fi
- done
+for signal in TERM KILL; do
+ for svc in tserver gc master monitor logger tracer; do
+ PID=$(ps -ef | egrep ${ACCUMULO} | grep "Main $svc" | grep -v grep | grep -v stop-here.sh
| awk '{print $2}' | head -1)
+ if [ ! -z $PID ]; then
+ echo "Stopping ${svc} on `hostname -a | head -1` with signal ${signal}"
+ kill -s ${signal} ${PID}
+ fi
+ done
done
|