You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/01/28 15:02:06 UTC
git commit: Revert "By default cassandra will no longer start without
jna"
Updated Branches:
refs/heads/trunk d939be46b -> 025474177
Revert "By default cassandra will no longer start without jna"
This reverts commit 68baaedd6f0adf4719f0c65296433d5f006c74c4.
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02547417
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02547417
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02547417
Branch: refs/heads/trunk
Commit: 0254741772262972a6d0535b3c88e5240be41ae7
Parents: d939be4
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jan 28 08:02:00 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jan 28 08:02:00 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 -
.../org/apache/cassandra/service/CassandraDaemon.java | 14 --------------
src/java/org/apache/cassandra/utils/CLibrary.java | 4 ++--
3 files changed, 2 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02547417/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 23bb4f1..ed7ce30 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,7 +24,6 @@
* Add cardinality estimator for key count estimation (CASSANDRA-5906)
* CF id is changed to be non-deterministic. Data dir/key cache are created
uniquely for CF id (CASSANDRA-5202)
- * Cassandra won't start by default without jna (CASSANDRA-6575)
* New counters implementation (CASSANDRA-6504)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02547417/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 0cadf96..c61981d 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -138,20 +138,6 @@ public class CassandraDaemon
*/
logger.info("Heap size: {}/{}", Runtime.getRuntime().totalMemory(), Runtime.getRuntime().maxMemory());
logger.info("Classpath: {}", System.getProperty("java.class.path"));
-
- // 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)
- {
- logger.error("JNA failing to initialize properly. Use -Dcassandra.boot_without_jna=true to bootstrap even so.");
- System.exit(3);
- }
- }
-
CLibrary.tryMlockall();
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02547417/src/java/org/apache/cassandra/utils/CLibrary.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CLibrary.java b/src/java/org/apache/cassandra/utils/CLibrary.java
index 4dd5223..a7ff815 100644
--- a/src/java/org/apache/cassandra/utils/CLibrary.java
+++ b/src/java/org/apache/cassandra/utils/CLibrary.java
@@ -60,11 +60,11 @@ public final class CLibrary
}
catch (NoClassDefFoundError e)
{
- logger.warn("JNA not found. Native methods will be disabled.");
+ logger.info("JNA not found. Native methods will be disabled.");
}
catch (UnsatisfiedLinkError e)
{
- logger.warn("JNA link failure, one or more native method will be unavailable.");
+ logger.info("JNA link failure, one or more native method will be unavailable.");
logger.debug("JNA link failure details: {}", e.getMessage());
}
catch (NoSuchMethodError e)