You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/05/07 20:39:46 UTC
[1/3] git commit: Raise the phi convict threshold check in 1.2
Repository: cassandra
Updated Branches:
refs/heads/trunk 6cecbf914 -> adea05f58
Raise the phi convict threshold check in 1.2
patch by tjake; reviewed by jbellis for CASSANDRA-7063
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21b3a679
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21b3a679
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21b3a679
Branch: refs/heads/trunk
Commit: 21b3a679f0dbb3f9219bba4624dff0be36d9fe8e
Parents: 0132e54
Author: Jake Luciani <ja...@apache.org>
Authored: Wed May 7 13:12:55 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Wed May 7 13:17:33 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 +-
src/java/org/apache/cassandra/streaming/AbstractStreamSession.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21b3a679/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d7b7f00..8533e64 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,7 +21,7 @@
* Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
* fix time conversion to milliseconds in SimpleCondition.await (CASSANDRA-7149)
* remove duplicate query for local tokens (CASSANDRA-7182)
-
+ * raise streaming phi convict threshold level (CASSANDRA-7063)
1.2.16
* Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/21b3a679/src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/AbstractStreamSession.java b/src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
index f8de827..77dbcd6 100644
--- a/src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
@@ -102,7 +102,7 @@ public abstract class AbstractStreamSession implements IEndpointStateChangeSubsc
return;
// We want a higher confidence in the failure detection than usual because failing a streaming wrongly has a high cost.
- if (phi < 2 * DatabaseDescriptor.getPhiConvictThreshold())
+ if (phi < 100 * DatabaseDescriptor.getPhiConvictThreshold())
return;
logger.error("Stream failed because {} died or was restarted/removed (streams may still be active "
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@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/adea05f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adea05f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adea05f5
Branch: refs/heads/trunk
Commit: adea05f58a357fd3b335ae9e7a835411808dfe92
Parents: 6cecbf9 411abc7
Author: Jake Luciani <ja...@apache.org>
Authored: Wed May 7 14:30:32 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Wed May 7 14:30:32 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.1
Posted by ja...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/411abc78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/411abc78
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/411abc78
Branch: refs/heads/trunk
Commit: 411abc78e11a80518179f56eca1a22786541e1a6
Parents: 0ca4942 21b3a67
Author: Jake Luciani <ja...@apache.org>
Authored: Wed May 7 14:27:09 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Wed May 7 14:27:09 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------