You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/05/20 18:25:04 UTC
[20/21] accumulo git commit: Merge tag '1.7.0' into 1.7
Merge tag '1.7.0' into 1.7
Apache Accumulo 1.7.0
Conflicts:
assemble/pom.xml
core/pom.xml
docs/pom.xml
examples/simple/pom.xml
fate/pom.xml
maven-plugin/pom.xml
minicluster/pom.xml
pom.xml
proxy/pom.xml
server/base/pom.xml
server/gc/pom.xml
server/master/pom.xml
server/monitor/pom.xml
server/native/pom.xml
server/tracer/pom.xml
server/tserver/pom.xml
shell/pom.xml
start/pom.xml
test/pom.xml
trace/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1faee537
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1faee537
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1faee537
Branch: refs/heads/master
Commit: 1faee537d8d557297d20f3d084b4e16127d00600
Parents: b577410 8cba812
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed May 20 12:07:59 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed May 20 12:07:59 2015 -0400
----------------------------------------------------------------------
CHANGES | 1 +
assemble/bin/config.sh | 6 +++---
assemble/bin/start-server.sh | 4 ++--
pom.xml | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1faee537/assemble/bin/config.sh
----------------------------------------------------------------------
diff --cc assemble/bin/config.sh
index ed393bb,d9bf8d4..9dfd164
--- a/assemble/bin/config.sh
+++ b/assemble/bin/config.sh
@@@ -104,15 -104,6 +104,15 @@@ the
fi
export HADOOP_PREFIX
- NUMA=`which numactl 2>/dev/null`
- NUMACTL_EXISTS="$?"
- NUMACTL_ARGS="--interleave=all"
++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/1faee537/assemble/bin/start-server.sh
----------------------------------------------------------------------
diff --cc assemble/bin/start-server.sh
index 3587ec9,2fb4c4c..8266457
--- a/assemble/bin/start-server.sh
+++ b/assemble/bin/start-server.sh
@@@ -77,12 -77,12 +77,12 @@@ if [[ -z "$PID" ]]; the
COMMAND="${bin}/accumulo_watcher.sh ${LOGHOST}"
fi
- 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
- ${NUMA_CMD} "$COMMAND" "${SERVICE}" --address "${ADDRESS}" >"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.out" 2>"${ACCUMULO_LOG_DIR}/${SERVICE}_${LOGHOST}.err" &
++ ${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 ${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'")
++ MAX_FILES_OPEN=$($SSH "$HOST" "/usr/bin/env bash -c 'ulimit -n'")
fi
if [[ -n $MAX_FILES_OPEN && -n $SLAVES ]] ; then
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1faee537/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 19ff679,24f25c9..3815ad7
--- a/pom.xml
+++ b/pom.xml
@@@ -95,7 -95,7 +95,7 @@@
<scm>
<connection>scm:git:git://git.apache.org/accumulo.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/accumulo.git</developerConnection>
- <tag>${project.version}</tag>
- <tag>1.7.0</tag>
++ <tag>HEAD</tag>
<url>https://git-wip-us.apache.org/repos/asf?p=accumulo.git</url>
</scm>
<issueManagement>