Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0772217EDA for ; Tue, 12 May 2015 15:59:48 +0000 (UTC) Received: (qmail 5965 invoked by uid 500); 12 May 2015 15:59:47 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 5932 invoked by uid 500); 12 May 2015 15:59:47 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 5923 invoked by uid 99); 12 May 2015 15:59:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 May 2015 15:59:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C22F4E0329; Tue, 12 May 2015 15:59:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Message-Id: <5e3f9748875546539cdda0710af621e2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: accumulo git commit: Revert "ACCUMULO-3793 use numctl to turn on memory interleaving" Date: Tue, 12 May 2015 15:59:47 +0000 (UTC) Repository: accumulo Updated Branches: refs/heads/branch-1.7.0 8e99ed222 -> 4db7766d7 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/branch-1.7.0 Commit: 4db7766d77497c4ab8b8cbd997fe1b4c267308f3 Parents: 8e99ed2 Author: Josh Elser Authored: Tue May 12 11:59:11 2015 -0400 Committer: Josh Elser 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