Mlock before opening system keyspace
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b61da9b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b61da9b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b61da9b5 Branch: refs/heads/trunk Commit: b61da9b56956929d9627e035b0d232b6b38bba91 Parents: cab33a6 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Thu Jun 11 16:51:25 2015 +0100 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Thu Jun 11 20:12:59 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++-- src/java/org/apache/cassandra/service/StartupChecks.java | 9 +-------- 3 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b61da9b5/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 72da59f..020cb46 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2 + * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573) * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf (CASSANDRA-9229) * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566) * Fix deprecated repair JMX API (CASSANDRA-9570) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b61da9b5/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index c1b4ad6..b8beafd 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -123,6 +123,8 @@ public class CassandraDaemon { logSystemInfo(); + CLibrary.tryMlockall(); + try { startupChecks.verify(); @@ -132,8 +134,6 @@ public class CassandraDaemon exitOrFail(e.returnCode, e.getMessage(), e.getCause()); } - CLibrary.tryMlockall(); - try { SystemKeyspace.snapshotOnVersionChange(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/b61da9b5/src/java/org/apache/cassandra/service/StartupChecks.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java index b6f233f..2d4686b 100644 --- a/src/java/org/apache/cassandra/service/StartupChecks.java +++ b/src/java/org/apache/cassandra/service/StartupChecks.java @@ -166,15 +166,8 @@ public class StartupChecks public void execute() throws StartupException { // Fail-fast if JNA is not available or failing to initialize properly - // except with -Dcassandra.boot_without_jna=true. See CASSANDRA-6575. if (!CLibrary.jnaAvailable()) - { - boolean jnaRequired = !Boolean.getBoolean("cassandra.boot_without_jna"); - - if (jnaRequired) - throw new StartupException(3, "JNA failing to initialize properly. " + - "Use -Dcassandra.boot_without_jna=true to bootstrap even so."); - } + throw new StartupException(3, "JNA failing to initialize properly. "); } };
