You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/11/14 03:28:48 UTC
[1/2] cassandra git commit: add check of the system wall clock time
at startup
Repository: cassandra
Updated Branches:
refs/heads/trunk b2808b1dc -> 0c6050bca
add check of the system wall clock time at startup
patch by jasobrown; reviewed by driftx for CASSANDRA-8305
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1470cee5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1470cee5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1470cee5
Branch: refs/heads/trunk
Commit: 1470cee58872b89ee8ae5d2f7e287ad7f32ed50b
Parents: feb2675
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Nov 12 18:31:04 2014 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 13 18:23:46 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/CassandraDaemon.java | 16 ++++++++++++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1470cee5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6caa5c7..6517c6a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.3
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
* Support for frozen collections (CASSANDRA-7859)
* Fix overflow on histogram computation (CASSANDRA-8028)
* Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1470cee5/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 38d0414..5897a22 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -24,6 +24,7 @@ import java.lang.management.MemoryPoolMXBean;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
+import java.util.Date;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -72,6 +73,13 @@ public class CassandraDaemon
private static final CassandraDaemon instance = new CassandraDaemon();
+ /**
+ * The earliest legit timestamp a casandra instance could have ever launched.
+ * Date roughly taken from http://perspectives.mvdirona.com/2008/07/12/FacebookReleasesCassandraAsOpenSource.aspx
+ * We use this to ensure the system clock is at least somewhat correct at startup.
+ */
+ private static final long EARLIEST_LAUNCH_DATE = 1215820800000L;
+
public Server thriftServer;
public Server nativeServer;
@@ -92,6 +100,14 @@ public class CassandraDaemon
{
logger.info("Could not resolve local host");
}
+
+ long now = System.currentTimeMillis();
+ if (now < EARLIEST_LAUNCH_DATE)
+ {
+ logger.error("current machine time is {}, but that is seemingly incorrect. exiting now.", new Date(now));
+ System.exit(3);
+ }
+
// log warnings for different kinds of sub-optimal JVMs. tldr use 64-bit Oracle >= 1.6u32
if (!DatabaseDescriptor.hasLargeAddressSpace())
logger.info("32bit JVM detected. It is recommended to run Cassandra on a 64bit JVM for better performance.");
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c6050bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c6050bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c6050bc
Branch: refs/heads/trunk
Commit: 0c6050bcaf4ec3aeedb3ba2eecbfee41285a6b79
Parents: b2808b1 1470cee
Author: Jason Brown <ja...@gmail.com>
Authored: Thu Nov 13 18:24:48 2014 -0800
Committer: Jason Brown <ja...@gmail.com>
Committed: Thu Nov 13 18:27:31 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/CassandraDaemon.java | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c6050bc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 82fbbc5,6517c6a..16e919e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,5 +1,39 @@@
+3.0
+ * Fix aggregate fn results on empty selection, result column name,
+ and cqlsh parsing (CASSANDRA-8229)
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
+ 7924, 7812, 8063)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * improve concurrency of repair (CASSANDRA-6455, 8208)
+
2.1.3
+ * add check of the system wall clock time at startup (CASSANDRA-8305)
* Support for frozen collections (CASSANDRA-7859)
* Fix overflow on histogram computation (CASSANDRA-8028)
* Have paxos reuse the timestamp generation of normal queries (CASSANDRA-7801)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c6050bc/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 7a51bb2,5897a22..d3ba085
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -102,6 -100,14 +110,15 @@@ public class CassandraDaemo
{
logger.info("Could not resolve local host");
}
+
+ long now = System.currentTimeMillis();
+ if (now < EARLIEST_LAUNCH_DATE)
+ {
- logger.error("current machine time is {}, but that is seemingly incorrect. exiting now.", new Date(now));
- System.exit(3);
++ String msg = String.format("current machine time is %s, but that is seemingly incorrect. exiting now.", new Date(now).toString());
++ logger.error(msg);
++ throw new IllegalStateException(msg);
+ }
+
// log warnings for different kinds of sub-optimal JVMs. tldr use 64-bit Oracle >= 1.6u32
if (!DatabaseDescriptor.hasLargeAddressSpace())
logger.info("32bit JVM detected. It is recommended to run Cassandra on a 64bit JVM for better performance.");