cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 29 May 2014 16:57:56 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	NEWS.txt
	src/java/org/apache/cassandra/config/CFMetaData.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/743becb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/743becb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/743becb5

Branch: refs/heads/trunk
Commit: 743becb540b0ff0a8c3c686480e8732d635f7d99
Parents: a0ef84f d72777b
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu May 29 19:57:24 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu May 29 19:57:24 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                          |  3 ++-
 NEWS.txt                                             | 12 ++++++++++++
 src/java/org/apache/cassandra/config/CFMetaData.java |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/743becb5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 820740f,98a0a33..fbe5f70
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -77,9 -44,11 +77,10 @@@ Merged from 2.0
   * Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950)
   * Invalid key cache entries on DROP (CASSANDRA-6525)
   * Fix flapping RecoveryManagerTest (CASSANDRA-7084)
-  * Add missing iso8601 patterns for date strings (6973)
++ * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * Add authentication support to shuffle (CASSANDRA-6484)
++ * Swap local and global default read repair chances (CASSANDRA-7320)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/743becb5/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index ab47576,422330c..c1b2b44
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,53 -13,16 +13,64 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +2.1
 +===
 +
 +New features
 +------------
 +   - SSTable data directory name is slightly changed. Each directory will
 +     have hex string appended after CF name, e.g.
 +         ks/cf-5be396077b811e3a3ab9dc4b9ac088d/
 +     This hex string part represents unique ColumnFamily ID.
 +     Note that existing directories are used as is, so only newly created
 +     directories after upgrade have new directory name format.
 +   - Saved key cache files also have ColumnFamily ID in their file name.
 +   - It is now possible to do incremental repairs, sstables that have been
 +     repaired are marked with a timestamp and not included in the next
 +     repair session. Use nodetool repair -par -inc to use this feature.
 +     A tool to manually mark/unmark sstables as repaired is available in
 +     tools/bin/sstablerepairedset. This is particularly important when
 +     using LCS, or any data not repaired in your first incremental repair
 +     will be put back in L0.
 +   - Bootstrapping now ensures that range movements are consistent,
 +     meaning the data for the new node is taken from the node that is no 
 +     longer a responsible for that range of keys.  
 +     If you want the old behavior (due to a lost node perhaps)
 +     you can set the following property (-Dconsistent.rangemovement=false)
 +
 +Upgrading
 +---------
 +   - Rolling upgrades from anything pre-2.0.7 is not supported. Furthermore
 +     pre-2.0 sstables are not supported. This means that before upgrading
 +     a node on 2.1, this node must be started on 2.0 and
 +     'nodetool upgdradesstables' must be run (and this even in the case
 +     of not-rolling upgrades).
 +   - For size-tiered compaction users, Cassandra now defaults to ignoring
 +     the coldest 5% of sstables.  This can be customized with the
 +     cold_reads_to_omit compaction option; 0.0 omits nothing (the old
 +     behavior) and 1.0 omits everything.
 +   - Multithreaded compaction has been removed.
 +   - Counters implementation has been changed, replaced by a safer one with
 +     less caveats, but different performance characteristics. You might have
 +     to change your data model to accomodate the new implementation.
 +     (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the dev
 +     blog post at http://www.datastax.com/dev/blog/<PLACEHOLDER> for details).
 +   - (per-table) index_interval parameter has been replaced with
 +     min_index_interval and max_index_interval paratemeters. index_interval
 +     has been deprecated.
 +   - support for supercolumns has been removed from json2sstable
 +
++
+ 2.0.9
+ =====
+ 
+ Operations
+ ----------
+     - Default values for read_repair_chance and local_read_repair_chance have been
+       swapped. Namely, default read_repair_chance is now set to 0.0, and default
+       local_read_repair_chance to 0.1.
+ 
+ 
  2.0.8
  =====
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/743becb5/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index f13b408,04b99e4..f6935e5
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -101,21 -61,23 +101,21 @@@ import org.apache.cassandra.thrift.CqlR
  import org.apache.cassandra.tracing.Tracing;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.apache.cassandra.utils.FBUtilities;
 +import org.apache.cassandra.utils.UUIDGen;
  
 -import static org.apache.cassandra.utils.FBUtilities.*;
 +import static org.apache.cassandra.utils.FBUtilities.fromJsonList;
 +import static org.apache.cassandra.utils.FBUtilities.fromJsonMap;
 +import static org.apache.cassandra.utils.FBUtilities.json;
  
 +/**
 + * This class can be tricky to modify. Please read http://wiki.apache.org/cassandra/ConfigurationNotes
for how to do so safely.
 + */
  public final class CFMetaData
  {
 -    //
 -    // !! Important !!
 -    // This class can be tricky to modify.  Please read http://wiki.apache.org/cassandra/ConfigurationNotes
 -    // for how to do so safely.
 -    //
 -
      private static final Logger logger = LoggerFactory.getLogger(CFMetaData.class);
  
-     public final static double DEFAULT_READ_REPAIR_CHANCE = 0.1;
-     public final static double DEFAULT_DCLOCAL_READ_REPAIR_CHANCE = 0.0;
+     public final static double DEFAULT_READ_REPAIR_CHANCE = 0.0;
+     public final static double DEFAULT_DCLOCAL_READ_REPAIR_CHANCE = 0.1;
 -    public final static boolean DEFAULT_REPLICATE_ON_WRITE = true;
      public final static int DEFAULT_GC_GRACE_SECONDS = 864000;
      public final static int DEFAULT_MIN_COMPACTION_THRESHOLD = 4;
      public final static int DEFAULT_MAX_COMPACTION_THRESHOLD = 32;


Mime
View raw message