From af20226dcadc6f15e245b3c786233d783d77b914 Mon Sep 17 00:00:00 2001
From: Matt Byrd <matthew.l.byrd@gmail.com>
Date: Thu, 29 Jun 2017 15:57:09 -0400
Subject: [PATCH] Allow different NUMACTL_ARGS to be passed in

Patch by Matt Byrd; Reviewed by Ariel Weisberg for CASSANDRA-13557
---
 CHANGES.txt   | 1 +
 bin/cassandra | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c5179e7a60..52b0027d4b 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)
diff --git a/bin/cassandra b/bin/cassandra
index 2dd0fe1ff2..ae48ba4837 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"