cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Wed, 18 Jun 2014 20:24:44 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/gms/FailureDetector.java


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

Branch: refs/heads/cassandra-2.0
Commit: 4c476f76f8fe0ecc1217f57234c1f22ce262a43c
Parents: afa304e ea83797
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Wed Jun 18 15:22:59 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Wed Jun 18 15:24:05 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                            | 1 +
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c476f76/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 776d294,232a860..8aef84d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 -1.2.17
 +2.0.9
 + * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
 + * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
 + * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Add per-CF range read request latency metrics (CASSANDRA-7338)
 + * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 + * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 + * Swap local and global default read repair chances (CASSANDRA-7320)
 + * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 + * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 + * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 + * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 + * Add authentication support to shuffle (CASSANDRA-6484)
 + * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
 + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
 + * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 + * Reference sstables before populating key cache (CASSANDRA-7234)
 +Merged from 1.2:
+  * reduce failure detector initial value to 2s (CASSANDRA-7307)
   * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
   * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268)
   * Track metrics at a keyspace level (CASSANDRA-6539)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c476f76/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/gms/FailureDetector.java
index a72eed3,ab4e937..60729d3
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@@ -74,14 -73,10 +74,14 @@@ public class FailureDetector implement
          }
      }
  
 -    private static int getInitialValue()
 +    private static long getInitialValue()
      {
          String newvalue = System.getProperty("cassandra.fd_initial_value_ms");
 -        if (newvalue != null)
 +        if (newvalue == null)
 +        {
-             return Gossiper.intervalInMillis * 30;
++            return Gossiper.intervalInMillis * 2;
 +        }
 +        else
          {
              logger.info("Overriding FD INITIAL_VALUE to {}ms", newvalue);
              return Integer.parseInt(newvalue);


Mime
View raw message