Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 70C971128E for ; Sun, 11 May 2014 03:08:59 +0000 (UTC) Received: (qmail 34076 invoked by uid 500); 10 May 2014 22:00:29 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 98721 invoked by uid 500); 10 May 2014 21:58:09 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 59342 invoked by uid 99); 10 May 2014 21:56:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 23B17939ADC; Wed, 7 May 2014 19:23:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Wed, 07 May 2014 19:23:36 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Raise the phi convict threshold check in 1.2 Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 05bacaeab -> ea7d0c827 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/cassandra-2.0 Commit: 21b3a679f0dbb3f9219bba4624dff0be36d9fe8e Parents: 0132e54 Author: Jake Luciani Authored: Wed May 7 13:12:55 2014 -0400 Committer: Jake Luciani 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 "