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/cassandra-2.1 Commit: 2800c7fdb8c4a913ad08670a1597036aa79d7ead Parents: 58bb974 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jun 3 10:35:11 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> 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);