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

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Jonathan Ellis 2014-06-04 13:45:33 -05:00
parent 2d76d9fc37 00b5c36cc5
commit 8e85f0c32f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/org/apache/cassandra/gms/FailureDetector.java
View File

@ -77,13 +77,15 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
private static long getInitialValue()
{
String newvalue = System.getProperty("cassandra.fd_initial_value_ms");
if (newvalue != null)
if (newvalue == null)
{
return Gossiper.intervalInMillis * 30;
}
else
{
logger.info("Overriding FD INITIAL_VALUE to {}ms", newvalue);
return Integer.parseInt(newvalue);
}
else
return Gossiper.intervalInMillis * 30;
}
public String getAllEndpointStates()
@ -311,13 +313,15 @@ class ArrivalWindow
private static long getMaxInterval()
{
String newvalue = System.getProperty("cassandra.fd_max_interval_ms");
if (newvalue != null)
if (newvalue == null)
{
return FailureDetector.INITIAL_VALUE_NANOS;
}
else
{
logger.info("Overriding FD MAX_INTERVAL to {}ms", newvalue);
return TimeUnit.NANOSECONDS.convert(Integer.parseInt(newvalue), TimeUnit.MILLISECONDS);
}
else
return FailureDetector.INITIAL_VALUE_NANOS;
}
synchronized void add(long value)