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 A7B881075E for ; Tue, 3 Jun 2014 15:35:45 +0000 (UTC) Received: (qmail 98182 invoked by uid 500); 3 Jun 2014 15:35:45 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 98073 invoked by uid 500); 3 Jun 2014 15:35:45 -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 97991 invoked by uid 99); 3 Jun 2014 15:35:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jun 2014 15:35:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 20E0194248C; Tue, 3 Jun 2014 15:35:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 03 Jun 2014 15:35:47 -0000 Message-Id: <119d6eae2fa84ef5abcfb5f161c558b5@git.apache.org> In-Reply-To: <39c404d29f044b8fb337fc732635d95c@git.apache.org> References: <39c404d29f044b8fb337fc732635d95c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: merge #7063 from 1.2 merge #7063 from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2800c7fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2800c7fd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2800c7fd Branch: refs/heads/trunk Commit: 2800c7fdb8c4a913ad08670a1597036aa79d7ead Parents: 58bb974 Author: Jonathan Ellis Authored: Tue Jun 3 10:35:11 2014 -0500 Committer: Jonathan Ellis Committed: Tue Jun 3 10:35:11 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/repair/RepairSession.java | 4 ++-- src/java/org/apache/cassandra/streaming/StreamSession.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2800c7fd/src/java/org/apache/cassandra/repair/RepairSession.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/RepairSession.java b/src/java/org/apache/cassandra/repair/RepairSession.java index ea31ff3..942049b 100644 --- a/src/java/org/apache/cassandra/repair/RepairSession.java +++ b/src/java/org/apache/cassandra/repair/RepairSession.java @@ -345,8 +345,8 @@ public class RepairSession extends WrappedRunnable implements IEndpointStateChan if (!endpoints.contains(endpoint)) return; - // We want a higher confidence in the failure detection than usual because failing a repair wrongly has a high cost. - if (phi < 2 * DatabaseDescriptor.getPhiConvictThreshold()) + // We want a higher confidence in the failure detection than usual because failing a repair wrongly has a high cost (CASSANDRA-7063) + if (phi < 100 * DatabaseDescriptor.getPhiConvictThreshold()) return; // Though unlikely, it is possible to arrive here multiple time and we http://git-wip-us.apache.org/repos/asf/cassandra/blob/2800c7fd/src/java/org/apache/cassandra/streaming/StreamSession.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java index 79ad487..55e30f0 100644 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@ -616,8 +616,8 @@ public class StreamSession implements IEndpointStateChangeSubscriber, IFailureDe if (!endpoint.equals(peer)) 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()) + // We want a higher confidence in the failure detection than usual because failing a streaming wrongly has a high cost (CASSANDRA-7063) + if (phi < 100 * DatabaseDescriptor.getPhiConvictThreshold()) return; closeSession(State.FAILED);