cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 03 Jun 2016 10:02:29 GMT
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 <sam@beobal.com>
Authored: Fri Jun 3 10:36:51 2016 +0100
Committer: Sam Tunnicliffe <sam@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
----------------------------------------------------------------------


Mime
View raw message