You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2016/06/03 10:02:25 UTC
[01/10] cassandra git commit: Persist local metadata in
SystemKeyspace earlier in initialization sequence
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 bb88b8cdc -> 360541f16
refs/heads/cassandra-3.0 bedc74257 -> 6b994cabe
refs/heads/cassandra-3.7 e08d197f8 -> ff42012ed
refs/heads/trunk f5ec3699e -> d9e79bd34
Persist local metadata in SystemKeyspace earlier in initialization sequence
Patch by Joel Knighton; reviewed by Sam Tunnicliffe for CASSANDRA-11742
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/360541f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/360541f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/360541f1
Branch: refs/heads/cassandra-2.2
Commit: 360541f16a158f560d7cce1fcc264e246a80d10f
Parents: bb88b8c
Author: Joel Knighton <jo...@datastax.com>
Authored: Tue May 24 12:07:41 2016 -0500
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 10:29:52 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9752d16..ce48994 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.7
+ * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
* Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 1ce599d..74a3c7b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -294,11 +294,10 @@ public final class SystemKeyspace
public static void finishStartup()
{
- persistLocalMetadata();
LegacySchemaTables.saveSystemKeyspaceSchema();
}
- private static void persistLocalMetadata()
+ public static void persistLocalMetadata()
{
String req = "INSERT INTO system.%s (" +
"key," +
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/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 1e9378b..6129928 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -177,6 +177,10 @@ public class CassandraDaemon
exitOrFail(3, e.getMessage(), e.getCause());
}
+ // We need to persist this as soon as possible after startup checks.
+ // This should be the first write to SystemKeyspace (CASSANDRA-11742)
+ SystemKeyspace.persistLocalMetadata();
+
maybeInitJmx();
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b994cab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b994cab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b994cab
Branch: refs/heads/trunk
Commit: 6b994cabe3f9cfc07179726f2a4f7090981d94b2
Parents: bedc742 360541f
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 3 10:36:51 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 10:56:39 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 70da4ad,ce48994..2de1e25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
-2.2.7
+3.0.7
+ * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849)
+ * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
+ * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
+ * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
+ * Remove unneeded code to repair index summaries that have
+ been improperly down-sampled (CASSANDRA-11127)
+ * Avoid WriteTimeoutExceptions during commit log replay due to materialized
+ view lock contention (CASSANDRA-11891)
+ * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530)
+ * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
+ * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
* Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 205df8b,74a3c7b..c5c6abe
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -465,11 -294,10 +465,10 @@@ public final class SystemKeyspac
public static void finishStartup()
{
- persistLocalMetadata();
- LegacySchemaTables.saveSystemKeyspaceSchema();
+ SchemaKeyspace.saveSystemKeyspacesSchema();
}
- private static void persistLocalMetadata()
+ public static void persistLocalMetadata()
{
String req = "INSERT INTO system.%s (" +
"key," +
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
[02/10] cassandra git commit: Persist local metadata in
SystemKeyspace earlier in initialization sequence
Posted by sa...@apache.org.
Persist local metadata in SystemKeyspace earlier in initialization sequence
Patch by Joel Knighton; reviewed by Sam Tunnicliffe for CASSANDRA-11742
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/360541f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/360541f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/360541f1
Branch: refs/heads/cassandra-3.0
Commit: 360541f16a158f560d7cce1fcc264e246a80d10f
Parents: bb88b8c
Author: Joel Knighton <jo...@datastax.com>
Authored: Tue May 24 12:07:41 2016 -0500
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 10:29:52 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9752d16..ce48994 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.7
+ * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
* Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 1ce599d..74a3c7b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -294,11 +294,10 @@ public final class SystemKeyspace
public static void finishStartup()
{
- persistLocalMetadata();
LegacySchemaTables.saveSystemKeyspaceSchema();
}
- private static void persistLocalMetadata()
+ public static void persistLocalMetadata()
{
String req = "INSERT INTO system.%s (" +
"key," +
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/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 1e9378b..6129928 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -177,6 +177,10 @@ public class CassandraDaemon
exitOrFail(3, e.getMessage(), e.getCause());
}
+ // We need to persist this as soon as possible after startup checks.
+ // This should be the first write to SystemKeyspace (CASSANDRA-11742)
+ SystemKeyspace.persistLocalMetadata();
+
maybeInitJmx();
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b994cab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b994cab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b994cab
Branch: refs/heads/cassandra-3.0
Commit: 6b994cabe3f9cfc07179726f2a4f7090981d94b2
Parents: bedc742 360541f
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 3 10:36:51 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 10:56:39 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 70da4ad,ce48994..2de1e25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
-2.2.7
+3.0.7
+ * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849)
+ * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
+ * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
+ * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
+ * Remove unneeded code to repair index summaries that have
+ been improperly down-sampled (CASSANDRA-11127)
+ * Avoid WriteTimeoutExceptions during commit log replay due to materialized
+ view lock contention (CASSANDRA-11891)
+ * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530)
+ * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
+ * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
* Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 205df8b,74a3c7b..c5c6abe
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -465,11 -294,10 +465,10 @@@ public final class SystemKeyspac
public static void finishStartup()
{
- persistLocalMetadata();
- LegacySchemaTables.saveSystemKeyspaceSchema();
+ SchemaKeyspace.saveSystemKeyspacesSchema();
}
- private static void persistLocalMetadata()
+ public static void persistLocalMetadata()
{
String req = "INSERT INTO system.%s (" +
"key," +
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
[04/10] cassandra git commit: Persist local metadata in
SystemKeyspace earlier in initialization sequence
Posted by sa...@apache.org.
Persist local metadata in SystemKeyspace earlier in initialization sequence
Patch by Joel Knighton; reviewed by Sam Tunnicliffe for CASSANDRA-11742
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/360541f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/360541f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/360541f1
Branch: refs/heads/trunk
Commit: 360541f16a158f560d7cce1fcc264e246a80d10f
Parents: bb88b8c
Author: Joel Knighton <jo...@datastax.com>
Authored: Tue May 24 12:07:41 2016 -0500
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 10:29:52 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9752d16..ce48994 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.7
+ * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
* Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 1ce599d..74a3c7b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -294,11 +294,10 @@ public final class SystemKeyspace
public static void finishStartup()
{
- persistLocalMetadata();
LegacySchemaTables.saveSystemKeyspaceSchema();
}
- private static void persistLocalMetadata()
+ public static void persistLocalMetadata()
{
String req = "INSERT INTO system.%s (" +
"key," +
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/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 1e9378b..6129928 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -177,6 +177,10 @@ public class CassandraDaemon
exitOrFail(3, e.getMessage(), e.getCause());
}
+ // We need to persist this as soon as possible after startup checks.
+ // This should be the first write to SystemKeyspace (CASSANDRA-11742)
+ SystemKeyspace.persistLocalMetadata();
+
maybeInitJmx();
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff42012e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff42012e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff42012e
Branch: refs/heads/cassandra-3.7
Commit: ff42012edd8651ca2567a670c2df9b3be6f51fcd
Parents: e08d197 6b994ca
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 3 10:58:48 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 10:58:48 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff42012e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2a66eb4,2de1e25..02914cf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,6 -13,8 +16,7 @@@ Merged from 3.0
* Refactor Materialized View code (CASSANDRA-11475)
* Update Java Driver (CASSANDRA-11615)
Merged from 2.2:
+ * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
- * Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
* Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
* Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff42012e/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff42012e/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9e79bd3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9e79bd3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9e79bd3
Branch: refs/heads/trunk
Commit: d9e79bd34e0b94b30eb710e81b8b3e19d4b95fc7
Parents: f5ec369 ff42012
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 3 11:00:14 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 11:00:14 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9e79bd3/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9e79bd3/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
[03/10] cassandra git commit: Persist local metadata in
SystemKeyspace earlier in initialization sequence
Posted by sa...@apache.org.
Persist local metadata in SystemKeyspace earlier in initialization sequence
Patch by Joel Knighton; reviewed by Sam Tunnicliffe for CASSANDRA-11742
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/360541f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/360541f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/360541f1
Branch: refs/heads/cassandra-3.7
Commit: 360541f16a158f560d7cce1fcc264e246a80d10f
Parents: bb88b8c
Author: Joel Knighton <jo...@datastax.com>
Authored: Tue May 24 12:07:41 2016 -0500
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 10:29:52 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9752d16..ce48994 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.7
+ * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
* Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 1ce599d..74a3c7b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -294,11 +294,10 @@ public final class SystemKeyspace
public static void finishStartup()
{
- persistLocalMetadata();
LegacySchemaTables.saveSystemKeyspaceSchema();
}
- private static void persistLocalMetadata()
+ public static void persistLocalMetadata()
{
String req = "INSERT INTO system.%s (" +
"key," +
http://git-wip-us.apache.org/repos/asf/cassandra/blob/360541f1/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 1e9378b..6129928 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -177,6 +177,10 @@ public class CassandraDaemon
exitOrFail(3, e.getMessage(), e.getCause());
}
+ // We need to persist this as soon as possible after startup checks.
+ // This should be the first write to SystemKeyspace (CASSANDRA-11742)
+ SystemKeyspace.persistLocalMetadata();
+
maybeInitJmx();
Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler()
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b994cab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b994cab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b994cab
Branch: refs/heads/cassandra-3.7
Commit: 6b994cabe3f9cfc07179726f2a4f7090981d94b2
Parents: bedc742 360541f
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 3 10:36:51 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 10:56:39 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 70da4ad,ce48994..2de1e25
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
-2.2.7
+3.0.7
+ * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849)
+ * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
+ * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
+ * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
+ * Remove unneeded code to repair index summaries that have
+ been improperly down-sampled (CASSANDRA-11127)
+ * Avoid WriteTimeoutExceptions during commit log replay due to materialized
+ view lock contention (CASSANDRA-11891)
+ * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530)
+ * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
+ * Allow compaction strategies to disable early open (CASSANDRA-11754)
+ * Refactor Materialized View code (CASSANDRA-11475)
+ * Update Java Driver (CASSANDRA-11615)
+Merged from 2.2:
+ * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
* Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
* Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/SystemKeyspace.java
index 205df8b,74a3c7b..c5c6abe
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@@ -465,11 -294,10 +465,10 @@@ public final class SystemKeyspac
public static void finishStartup()
{
- persistLocalMetadata();
- LegacySchemaTables.saveSystemKeyspaceSchema();
+ SchemaKeyspace.saveSystemKeyspacesSchema();
}
- private static void persistLocalMetadata()
+ public static void persistLocalMetadata()
{
String req = "INSERT INTO system.%s (" +
"key," +
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b994cab/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff42012e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff42012e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff42012e
Branch: refs/heads/trunk
Commit: ff42012edd8651ca2567a670c2df9b3be6f51fcd
Parents: e08d197 6b994ca
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jun 3 10:58:48 2016 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jun 3 10:58:48 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +--
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff42012e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2a66eb4,2de1e25..02914cf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -16,6 -13,8 +16,7 @@@ Merged from 3.0
* Refactor Materialized View code (CASSANDRA-11475)
* Update Java Driver (CASSANDRA-11615)
Merged from 2.2:
+ * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
- * Run CommitLog tests with different compression settings (CASSANDRA-9039)
* cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)
* Avoid showing estimated key as -1 in tablestats (CASSANDRA-11587)
* Fix possible race condition in CommitLog.recover (CASSANDRA-11743)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff42012e/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff42012e/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------