From 2800c7fdb8c4a913ad08670a1597036aa79d7ead Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Tue, 3 Jun 2014 10:35:11 -0500 Subject: [PATCH] merge #7063 from 1.2 --- 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(-) diff --git a/src/java/org/apache/cassandra/repair/RepairSession.java b/src/java/org/apache/cassandra/repair/RepairSession.java index ea31ff3702..942049bc47 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 diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java index 79ad4870b6..55e30f0fa4 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);