You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/06/18 22:24:39 UTC
[01/10] git commit: Set fd initial value to 2s
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 20fffa999 -> ea837970b
refs/heads/cassandra-2.0 afa304e33 -> 4c476f76f
refs/heads/cassandra-2.1 423b62cd3 -> 197d43941
refs/heads/trunk cf4f2dd95 -> 219ab71fe
Set fd initial value to 2s
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7307
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea837970
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea837970
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea837970
Branch: refs/heads/cassandra-1.2
Commit: ea837970be8901ae229cad79a7d7592cdd9fd34a
Parents: 20fffa9
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 15:21:09 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 18 15:22:29 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/ea837970/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25ea22b..232a860 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * 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/ea837970/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index ac54414..ab4e937 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -82,7 +82,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
return Integer.parseInt(newvalue);
}
else
- return Gossiper.intervalInMillis * 30;
+ return Gossiper.intervalInMillis * 2;
}
public String getAllEndpointStates()
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
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/trunk
Commit: 4c476f76f8fe0ecc1217f57234c1f22ce262a43c
Parents: afa304e ea83797
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 15:22:59 2014 -0500
Committer: Brandon Williams <br...@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);
[05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
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.1
Commit: 4c476f76f8fe0ecc1217f57234c1f22ce262a43c
Parents: afa304e ea83797
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 15:22:59 2014 -0500
Committer: Brandon Williams <br...@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);
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@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/219ab71f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/219ab71f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/219ab71f
Branch: refs/heads/trunk
Commit: 219ab71fe036d485779564397fc8a976a9661c36
Parents: cf4f2dd 197d439
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 15:24:33 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 18 15:24:33 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/219ab71f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/219ab71f/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/197d4394
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/197d4394
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/197d4394
Branch: refs/heads/cassandra-2.1
Commit: 197d43941e8139e91e7028b24a50177bf8ea47bd
Parents: 423b62c 4c476f7
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 15:24:19 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 18 15:24:19 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/197d4394/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 335192b,8aef84d..216b0af
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,24 +1,26 @@@
-2.0.9
- * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
- * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+2.1.0
+ * Avoid incremental compaction on Windows (CASSANDRA-7365)
+ * Fix exception when querying a composite-keyed table with a collection index
+ (CASSANDRA-7372)
+ * Use node's host id in place of counter ids (CASSANDRA-7366)
* Fix native protocol CAS batches (CASSANDRA-7337)
+ * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
+ * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
+ * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
+ * Don't fail streams on failure detector downs (CASSANDRA-3569)
+ * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
+ * Reduce run time for CQL tests (CASSANDRA-7327)
+ * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
+ * RefCount native frames from netty (CASSANDRA-7245)
+ * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
+Merged from 2.0:
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
* 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/197d4394/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
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 <br...@apache.org>
Authored: Wed Jun 18 15:22:59 2014 -0500
Committer: Brandon Williams <br...@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);
[04/10] git commit: Set fd initial value to 2s
Posted by br...@apache.org.
Set fd initial value to 2s
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7307
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea837970
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea837970
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea837970
Branch: refs/heads/trunk
Commit: ea837970be8901ae229cad79a7d7592cdd9fd34a
Parents: 20fffa9
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 15:21:09 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 18 15:22:29 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/ea837970/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25ea22b..232a860 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * 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/ea837970/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index ac54414..ab4e937 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -82,7 +82,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
return Integer.parseInt(newvalue);
}
else
- return Gossiper.intervalInMillis * 30;
+ return Gossiper.intervalInMillis * 2;
}
public String getAllEndpointStates()
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/197d4394
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/197d4394
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/197d4394
Branch: refs/heads/trunk
Commit: 197d43941e8139e91e7028b24a50177bf8ea47bd
Parents: 423b62c 4c476f7
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 15:24:19 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 18 15:24:19 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/197d4394/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 335192b,8aef84d..216b0af
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,24 +1,26 @@@
-2.0.9
- * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
- * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+2.1.0
+ * Avoid incremental compaction on Windows (CASSANDRA-7365)
+ * Fix exception when querying a composite-keyed table with a collection index
+ (CASSANDRA-7372)
+ * Use node's host id in place of counter ids (CASSANDRA-7366)
* Fix native protocol CAS batches (CASSANDRA-7337)
+ * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
+ * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
+ * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
+ * Don't fail streams on failure detector downs (CASSANDRA-3569)
+ * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
+ * Reduce run time for CQL tests (CASSANDRA-7327)
+ * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
+ * RefCount native frames from netty (CASSANDRA-7245)
+ * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
+Merged from 2.0:
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
* 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/197d4394/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
[03/10] git commit: Set fd initial value to 2s
Posted by br...@apache.org.
Set fd initial value to 2s
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7307
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea837970
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea837970
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea837970
Branch: refs/heads/cassandra-2.1
Commit: ea837970be8901ae229cad79a7d7592cdd9fd34a
Parents: 20fffa9
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 15:21:09 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 18 15:22:29 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/ea837970/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25ea22b..232a860 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * 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/ea837970/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index ac54414..ab4e937 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -82,7 +82,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
return Integer.parseInt(newvalue);
}
else
- return Gossiper.intervalInMillis * 30;
+ return Gossiper.intervalInMillis * 2;
}
public String getAllEndpointStates()
[02/10] git commit: Set fd initial value to 2s
Posted by br...@apache.org.
Set fd initial value to 2s
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7307
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea837970
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea837970
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea837970
Branch: refs/heads/cassandra-2.0
Commit: ea837970be8901ae229cad79a7d7592cdd9fd34a
Parents: 20fffa9
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 15:21:09 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jun 18 15:22:29 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/ea837970/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 25ea22b..232a860 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.17
+ * 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/ea837970/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index ac54414..ab4e937 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -82,7 +82,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
return Integer.parseInt(newvalue);
}
else
- return Gossiper.intervalInMillis * 30;
+ return Gossiper.intervalInMillis * 2;
}
public String getAllEndpointStates()