You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2017/06/29 20:13:43 UTC

[2/6] cassandra git commit: Allow different NUMACTL_ARGS to be passed in

Allow different NUMACTL_ARGS to be passed in

Patch by Matt Byrd; Reviewed by Ariel Weisberg for CASSANDRA-13557


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

Branch: refs/heads/cassandra-3.11
Commit: af20226dcadc6f15e245b3c786233d783d77b914
Parents: a1baead
Author: Matt Byrd <ma...@gmail.com>
Authored: Thu Jun 29 15:57:09 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Thu Jun 29 15:57:09 2017 -0400

----------------------------------------------------------------------
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af20226d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c5179e7..52b0027 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.15
+ * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
  * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)
  * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
  * Nodetool listsnapshots output is missing a newline, if there are no snapshots (CASSANDRA-13568)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/af20226d/bin/cassandra
----------------------------------------------------------------------
diff --git a/bin/cassandra b/bin/cassandra
index 2dd0fe1..ae48ba4 100755
--- a/bin/cassandra
+++ b/bin/cassandra
@@ -107,7 +107,7 @@ fi
 # avoid disk I/O. Even for the purpose of CPU efficiency, we don't
 # really have CPU<->data affinity anyway. Also, empirically test that numactl
 # works before trying to use it (CASSANDRA-3245).
-NUMACTL_ARGS="--interleave=all"
+NUMACTL_ARGS=${NUMACTL_ARGS:-"--interleave=all"}
 if which numactl >/dev/null 2>/dev/null && numactl $NUMACTL_ARGS ls / >/dev/null 2>/dev/null
 then
     NUMACTL="numactl $NUMACTL_ARGS"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org