accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [9/9] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Thu, 28 Aug 2014 01:46:09 GMT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	assemble/bin/start-server.sh
	assemble/bin/stop-server.sh


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91186bf2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91186bf2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91186bf2

Branch: refs/heads/master
Commit: 91186bf2779185a679ed1e7a7ce0680d0e4cb9e6
Parents: 572d473 8147b19
Author: Josh Elser <elserj@apache.org>
Authored: Wed Aug 27 21:42:32 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Aug 27 21:42:32 2014 -0400

----------------------------------------------------------------------
 assemble/bin/start-server.sh | 20 ++++++++++++++------
 assemble/bin/stop-server.sh  |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/91186bf2/assemble/bin/start-server.sh
----------------------------------------------------------------------
diff --cc assemble/bin/start-server.sh
index 2afabb9,aa1375a..43b5d8c
--- a/assemble/bin/start-server.sh
+++ b/assemble/bin/start-server.sh
@@@ -35,43 -35,54 +35,51 @@@ if [[ $? != 0 ]]; the
  else
     LOGHOST=$(host "$1" | head -1 | cut -d' ' -f1)
  fi
 -ADDRESS="$1"
 -SERVICE="$2"
 -LONGNAME="$3"
 -if [ -z "$LONGNAME" ]; then
 -   LONGNAME="$2"
 -fi
 -SLAVES=$( wc -l < ${ACCUMULO_CONF_DIR}/slaves )
 +ADDRESS=$1
 +SERVICE=$2
 +LONGNAME=$3
 +[[ -z $LONGNAME ]] && LONGNAME=$2
 +
 +SLAVES=$(wc -l < "${ACCUMULO_CONF_DIR}/slaves")
  
  IFCONFIG=/sbin/ifconfig
 -if [ ! -x $IFCONFIG ]; then
 -   IFCONFIG='/bin/netstat -ie'
 -fi
 +[[ ! -x $IFCONFIG ]] && IFCONFIG='/bin/netstat -ie'
 +
- # ACCUMULO-1985 Allow monitor to bind on all interfaces
- if [[ $SERVICE == monitor && $ACCUMULO_MONITOR_BIND_ALL == true ]]; then
-     ADDRESS="0.0.0.0"
- fi
  
 -ip=$($IFCONFIG 2>/dev/null| grep inet[^6] | awk '{print $2}' | sed 's/addr://' | grep
-v 0.0.0.0 | grep -v 127.0.0.1 | head -n 1)
 -if [ $? != 0 ]
 -then
 -   ip=$(python -c 'import socket as s; print s.gethostbyname(s.getfqdn())')
 +IP=$($IFCONFIG 2>/dev/null| grep "inet[^6]" | awk '{print $2}' | sed 's/addr://' | grep
-v 0.0.0.0 | grep -v 127.0.0.1 | head -n 1)
 +if [[ $? != 0 ]] ; then
 +   IP=$(python -c 'import socket as s; print s.gethostbyname(s.getfqdn())')
  fi
  
- if [[ $HOST == localhost || $HOST == "$(hostname)" || $HOST = "$IP" ]]; then
+ # When the hostname provided is the alias/shortname, try to use the FQDN to make
+ # sure we send the right address to the Accumulo process.
 -if [ "$HOST" = "`hostname -s`" ]; then
 -    HOST="`hostname -f`"
++if [[ "$HOST" = "$(hostname -s)" ]]; then
++    HOST="$(hostname -f)"
+     ADDRESS="$HOST"
+ fi
+ 
+ # ACCUMULO-1985 Allow monitor to bind on all interfaces
 -if [ ${SERVICE} == "monitor" -a ${ACCUMULO_MONITOR_BIND_ALL} == "true" ]; then
++if [[ ${SERVICE} == "monitor" && ${ACCUMULO_MONITOR_BIND_ALL} == "true" ]]; then
+     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 || $HOST == "$(hostname)" || $HOST = "$IP" ]]; then
 -   if [ "$HOST" = "localhost" -o "$HOST" = "`hostname -f`" -o "$HOST" = "$ip" ]; then
 -      ${bin}/accumulo ${SERVICE} --address ${ADDRESS} >${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out
2>${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err & 
++   if [[ $HOST == localhost || $HOST == "$(hostname -f)" || $HOST = "$IP" ]]; then
 +      "${bin}/accumulo" "${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 ${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 ${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'") 
     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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/91186bf2/assemble/bin/stop-server.sh
----------------------------------------------------------------------
diff --cc assemble/bin/stop-server.sh
index 52696af,d615172..78ef783
--- a/assemble/bin/stop-server.sh
+++ b/assemble/bin/stop-server.sh
@@@ -39,16 -41,16 +39,16 @@@ the
  fi
  
  # only stop if there's not one already running
- if [[ $HOST == localhost || $HOST = "$(hostname)" || $HOST = "$IP" ]] ; then
 -if [ "$HOST" = "localhost" -o "$HOST" = "`hostname -s`" -o "$HOST" = "`hostname -f`" -o
"$HOST" = "$ip" ]; then
++if [[ $HOST == localhost || $HOST = "$(hostname -s)" || $HOST = "$(hostname -f)" || $HOST
= "$IP" ]] ; then
     PID=$(ps -ef | grep "$ACCUMULO_HOME" | egrep ${2} | grep "Main ${3}" | grep -v grep |
grep -v ssh | grep -v stop-server.sh | awk {'print $2'} | head -1)
 -   if [ ! -z $PID ]; then
 +   if [[ -n $PID ]]; then
        echo "Stopping ${3} on $1";
 -      kill -s ${4} ${PID} 2>/dev/null
 +      kill -s "${4}" "${PID}" 2>/dev/null
     fi;
  else
 -   PID=$(ssh -q -o 'ConnectTimeout 8' $1 "ps -ef | grep \"$ACCUMULO_HOME\" |  egrep '${2}'
| grep 'Main ${3}' | grep -v grep | grep -v ssh | grep -v stop-server.sh" | awk {'print $2'}
| head -1)
 -   if [ ! -z $PID ]; then
 +   PID=$(ssh -q -o 'ConnectTimeout 8' "$1" "ps -ef | grep \"$ACCUMULO_HOME\" |  egrep '${2}'
| grep 'Main ${3}' | grep -v grep | grep -v ssh | grep -v stop-server.sh" | awk {'print $2'}
| head -1)
 +   if [[ -n $PID ]]; then
        echo "Stopping ${3} on $1";
 -      ssh -q -o 'ConnectTimeout 8' $1 "kill -s ${4} ${PID} 2>/dev/null"
 +      ssh -q -o 'ConnectTimeout 8' "$1" "kill -s ${4} ${PID} 2>/dev/null"
     fi;
  fi


Mime
View raw message