natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge #7063 from 1.2

This commit is contained in:
Jonathan Ellis 2014-06-03 10:35:11 -05:00
parent 58bb974a33
commit 2800c7fdb8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/cassandra/repair/RepairSession.java
View File

@ -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

4
src/java/org/apache/cassandra/streaming/StreamSession.java
View File

@ -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);