accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [02/21] accumulo git commit: Revert "ACCUMULO-3793 use numctl to turn on memory interleaving"
Date Wed, 20 May 2015 16:24:46 GMT
Revert "ACCUMULO-3793 use numctl to turn on memory interleaving"

This reverts commit b82148777c023b21578d06ef451fdd70770107a5.

Conflicts:
	assemble/bin/config.sh
	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/4db7766d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4db7766d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4db7766d

Branch: refs/heads/master
Commit: 4db7766d77497c4ab8b8cbd997fe1b4c267308f3
Parents: 8e99ed2
Author: Josh Elser <elserj@apache.org>
Authored: Tue May 12 11:59:11 2015 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Tue May 12 11:59:11 2015 -0400

----------------------------------------------------------------------
 assemble/bin/config.sh       | 9 ---------
 assemble/bin/start-server.sh | 8 ++++----
 2 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4db7766d/assemble/bin/config.sh
----------------------------------------------------------------------
diff --git a/assemble/bin/config.sh b/assemble/bin/config.sh
index ed393bb..d9bf8d4 100755
--- a/assemble/bin/config.sh
+++ b/assemble/bin/config.sh
@@ -104,15 +104,6 @@ then
 fi
 export HADOOP_PREFIX
 
-NUMA=`which numactl 2>/dev/null`
-NUMACTL_EXISTS="$?"
-NUMACTL_ARGS="--interleave=all"
-if [[ ${NUMACTL_EXISTS} -eq 0 ]] ; then
-  export NUMA_CMD="${NUMA} ${NUMACTL_ARGS}"
-else
-  export NUMA_CMD=""
-fi
-
 export HADOOP_HOME=$HADOOP_PREFIX
 export HADOOP_HOME_WARN_SUPPRESS=true
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4db7766d/assemble/bin/start-server.sh
----------------------------------------------------------------------
diff --git a/assemble/bin/start-server.sh b/assemble/bin/start-server.sh
index 3587ec9..2fb4c4c 100755
--- a/assemble/bin/start-server.sh
+++ b/assemble/bin/start-server.sh
@@ -77,12 +77,12 @@ if [[ -z "$PID" ]]; 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" & 
+   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 & 
       MAX_FILES_OPEN=$(ulimit -n)
    else
-      $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'") 
+      $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


Mime
View raw message