accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [1/3] accumulo git commit: ACCUMULO-4298: Add env variables to make NUMA configurable
Date Thu, 05 May 2016 18:23:14 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.8 ce7c1fa5d -> c044127a9


ACCUMULO-4298: Add env variables to make NUMA configurable


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

Branch: refs/heads/1.8
Commit: f71f29338d6b50c57a85dfc720cd7dd9b6fa0bfd
Parents: 397de58
Author: Dave Marion <dlmarion@apache.org>
Authored: Thu May 5 13:32:04 2016 -0400
Committer: Dave Marion <dlmarion@apache.org>
Committed: Thu May 5 13:32:04 2016 -0400

----------------------------------------------------------------------
 assemble/bin/config.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f71f2933/assemble/bin/config.sh
----------------------------------------------------------------------
diff --git a/assemble/bin/config.sh b/assemble/bin/config.sh
index 9bee91b..89a5e48 100755
--- a/assemble/bin/config.sh
+++ b/assemble/bin/config.sh
@@ -42,6 +42,10 @@
 # Values set by script if certain files exist
 # ACCUMULO_JAAS_CONF  Location of jaas.conf file. Needed by JAAS for things like Kerberos
based logins
 # ACCUMULO_KRB5_CONF  Location of krb5.conf file. Needed by Kerberos subsystems to find login
servers
+#
+# NUMA related environment variables
+# ACCUMULO_ENABLE_NUMACTL   (Default: true) Use numactl if present on the system
+# ACCUMULO_NUMACTL_OPTIONS  (Default: --interleave=all) options to the numactl command
 
 if [ -z "${ACCUMULO_HOME}" ] ; then
   # Start: Resolve Script Directory
@@ -149,11 +153,12 @@ if [ ! -f "$ACCUMULO_CONF_DIR/gc" -a -z "${ACCUMULO_VERIFY_ONLY}" ];
then
   fi
 fi
 
+ACCUMULO_ENABLE_NUMACTL=${ACCUMULO_ENABLE_NUMACTL:-"true"}
+ACCUMULO_NUMACTL_OPTIONS=${ACCUMULO_NUMACTL_OPTIONS:-"--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}"
+if [[ ( ${NUMACTL_EXISTS} -eq 0 ) && ( ${ACCUMULO_ENABLE_NUMACTL} == "true" ) ]]
; then
+  export NUMA_CMD="${NUMA} ${ACCUMULO_NUMACTL_OPTIONS}"
 else
   export NUMA_CMD=""
 fi


Mime
View raw message