Merge branch '1.6' into 1.7
Conflicts:
assemble/bin/start-server.sh
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a25ec8ec
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a25ec8ec
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a25ec8ec
Branch: refs/heads/1.7
Commit: a25ec8eca807cc17a8fa0ee54cf4a887e187c962
Parents: 14e88e4 abc6966
Author: Keith Turner <ktur...@apache.org>
Authored: Wed Dec 30 10:11:56 2015 -0500
Committer: Keith Turner <ktur...@apache.org>
Committed: Wed Dec 30 10:11:56 2015 -0500
----------------------------------------------------------------------
assemble/bin/start-server.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a25ec8ec/assemble/bin/start-server.sh
----------------------------------------------------------------------
diff --cc assemble/bin/start-server.sh
index 8266457,8f37d50..42613fb
--- a/assemble/bin/start-server.sh
+++ b/assemble/bin/start-server.sh
@@@ -64,28 -66,23 +64,28 @@@ if [[ ${SERVICE} == "monitor" && ${ACCU
ADDRESS="0.0.0.0"
fi
-if [ "$HOST" = "localhost" -o "$HOST" = "`hostname -f`" -o "$HOST" = "$ip" ];
then
+if [[ $HOST == localhost || $HOST == "$(hostname -f)" || $HOST = "$IP" ]];
then
PID=$(ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep "Main
$SERVICE" | grep -v grep | awk {'print $2'} | head -1)
else
- PID=$($SSH $HOST ps -ef | egrep ${ACCUMULO_HOME}/.*/accumulo.*.jar | grep
"Main $SERVICE" | grep -v grep | awk {'print $2'} | head -1)
+ PID=$($SSH "$HOST" ps -ef | egrep "${ACCUMULO_HOME}/.*/accumulo.*.jar" |
grep "Main $SERVICE" | grep -v grep | awk {'print $2'} | head -1)
fi
-if [ -z "$PID" ]; then
+if [[ -z "$PID" ]]; then
echo "Starting $LONGNAME on $HOST"
- if [ "$HOST" = "localhost" -o "$HOST" = "`hostname -f`" -o "$HOST" = "$ip"
]; then
- nohup ${NUMA_CMD} ${bin}/accumulo ${SERVICE} --address ${ADDRESS}
>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err &
+ COMMAND="${bin}/accumulo"
+ if [ "${ACCUMULO_WATCHER}" = "true" ]; then
+ COMMAND="${bin}/accumulo_watcher.sh ${LOGHOST}"
+ fi
+
+ if [[ $HOST == localhost || $HOST == "$(hostname -f)" || $HOST = "$IP" ]];
then
- ${NUMA_CMD} "$COMMAND" "${SERVICE}" --address "${ADDRESS}"
>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out"
2>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err" &
++ nohup ${NUMA_CMD} "$COMMAND" "${SERVICE}" --address "${ADDRESS}"
>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out"
2>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err" &
MAX_FILES_OPEN=$(ulimit -n)
else
- $SSH $HOST "bash -c 'exec nohup ${NUMA_CMD} ${bin}/accumulo ${SERVICE}
--address ${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
- MAX_FILES_OPEN=$($SSH $HOST "/usr/bin/env bash -c 'ulimit -n'")
+ $SSH "$HOST" "bash -c 'exec nohup ${NUMA_CMD} $COMMAND ${SERVICE}
--address ${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err' &"
+ MAX_FILES_OPEN=$($SSH "$HOST" "/usr/bin/env bash -c 'ulimit -n'")
fi
- if [ -n "$MAX_FILES_OPEN" ] && [ -n "$SLAVES" ] ; then
+ if [[ -n $MAX_FILES_OPEN && -n $SLAVES ]] ; then
MAX_FILES_RECOMMENDED=${MAX_FILES_RECOMMENDED:-32768}
if (( SLAVES > 10 )) && (( MAX_FILES_OPEN < MAX_FILES_RECOMMENDED ))
then
