Author: jbellis
Date: Mon Sep 26 20:48:52 2011
New Revision: 1176048
URL: http://svn.apache.org/viewvc?rev=1176048&view=rev
Log:
test for NUMA policy support as well as numactl presence
patch by Peter Schuller; reviewed by Paul Cannon for CASSANDRA-3245
Modified:
cassandra/branches/cassandra-1.0.0/CHANGES.txt
cassandra/branches/cassandra-1.0.0/bin/cassandra
Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1176048&r1=1176047&r2=1176048&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Mon Sep 26 20:48:52 2011
@@ -1,6 +1,7 @@
1.0.0-final
* Log a miningfull warning when a node receive a message for a repair session
that don't exist anymore (CASSANDRA-3256)
+ * test for NUMA policy support as well as numactl presence (CASSANDRA-3245)
1.0.0-rc1
Modified: cassandra/branches/cassandra-1.0.0/bin/cassandra
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/bin/cassandra?rev=1176048&r1=1176047&r2=1176048&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/bin/cassandra (original)
+++ cassandra/branches/cassandra-1.0.0/bin/cassandra Mon Sep 26 20:48:52 2011
@@ -91,10 +91,12 @@ fi
# If numactl is available, use it. For Cassandra, the priority is to
# avoid disk I/O. Even for the purpose of CPU efficiency, we don't
-# really have CPU<->data affinity anyway.
-if which numactl >/dev/null 2>/dev/null
+# really have CPU<->data affinity anyway. Also, empirically test that numactl
+# works before trying to use it (CASSANDRA-3245).
+NUMACTL_ARGS="--interleave=all"
+if which numactl >/dev/null 2>/dev/null && numactl $NUMACTL_ARGS ls /
>/dev/null 2>/dev/null
then
- NUMACTL="numactl --interleave=all"
+ NUMACTL="numactl $NUMACTL_ARGS"
else
NUMACTL=""
fi
