You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/08/08 19:57:26 UTC
git commit: Remove jvm revision checks.. for now
Updated Branches:
refs/heads/trunk c7782f2de -> 93f838d18
Remove jvm revision checks.. for now
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93f838d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93f838d1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93f838d1
Branch: refs/heads/trunk
Commit: 93f838d18518b42427f6596041a7d7edecda4ff4
Parents: c7782f2
Author: Brandon Williams <br...@apache.org>
Authored: Thu Aug 8 12:57:04 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Aug 8 12:57:04 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/service/CassandraDaemon.java | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f838d1/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 f49d549..20c70e7 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -157,7 +157,7 @@ public class CassandraDaemon
{
logger.warn("Non-Oracle JVM detected. Some features, such as immediate unmap of compacted SSTables, may not work as intended");
}
- else
+ /* else
{
String[] java_version = javaVersion.split("_");
String java_major = java_version[0];
@@ -172,18 +172,8 @@ public class CassandraDaemon
logger.info("Unable to parse java version {}", Arrays.toString(java_version));
java_minor = 32;
}
- if (java_major.equals("1.6.0"))
- {
- // These need to be updated from time to time, but these are currently valid (12.18.2012)
- if (java_minor < 29)
- // Seen to be a major contributing factor for heap and load issues
- logger.error("Your JVM is out of date. Please upgrade to the newest Oracle Java 6.");
- else if (java_minor < 32)
- // Updates 32+ have been seen to work well enough in the wild
- logger.warn("Your JVM is out of date. Please upgrade to the newest Oracle Java 6.");
- }
}
-
+ */
logger.info("Heap size: {}/{}", Runtime.getRuntime().totalMemory(), Runtime.getRuntime().maxMemory());
logger.info("Classpath: {}", System.getProperty("java.class.path"));
CLibrary.tryMlockall();