Updated Branches: refs/heads/trunk 008cc7ebd -> 3f40c6e63
Make phi_convict_threshold a float. Patch by Harish Doddi, reviewed by brandonwilliams for CASSANDRA3910 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f40c6e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f40c6e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f40c6e6 Branch: refs/heads/trunk Commit: 3f40c6e63e06b27402aa60830ffc4fd1b4172993 Parents: 008cc7e Author: Brandon Williams <[email protected]> Authored: Thu Mar 8 15:21:16 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Thu Mar 8 15:21:16 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/config/DatabaseDescriptor.java | 2 +- .../org/apache/cassandra/gms/FailureDetector.java | 6 +++--- .../apache/cassandra/gms/FailureDetectorMBean.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f40c6e6/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index 27550b6..474b2b3 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -49,7 +49,7 @@ public class Config public Integer streaming_socket_timeout_in_ms = new Integer(0); - public Integer phi_convict_threshold = 8; + public Double phi_convict_threshold = 8.0; public Integer concurrent_reads = 8; public Integer concurrent_writes = 32; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f40c6e6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 1f9a7c0..535c79e 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -682,7 +682,7 @@ public class DatabaseDescriptor conf.rpc_timeout_in_ms = timeOutInMillis; } - public static int getPhiConvictThreshold() + public static double getPhiConvictThreshold() { return conf.phi_convict_threshold; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f40c6e6/src/java/org/apache/cassandra/gms/FailureDetector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java index bf47cc9..e95da1b 100644 --- a/src/java/org/apache/cassandra/gms/FailureDetector.java +++ b/src/java/org/apache/cassandra/gms/FailureDetector.java @@ -47,7 +47,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean public static final IFailureDetector instance = new FailureDetector(); private static final Logger logger = LoggerFactory.getLogger(FailureDetector.class); - private static int phiConvictThreshold; + private static double phiConvictThreshold; private final Map<InetAddress, ArrivalWindow> arrivalSamples = new Hashtable<InetAddress, ArrivalWindow>(); private final List<IFailureDetectionEventListener> fdEvntListeners = new CopyOnWriteArrayList<IFailureDetectionEventListener>(); @@ -127,12 +127,12 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean } } - public void setPhiConvictThreshold(int phi) + public void setPhiConvictThreshold(double phi) { phiConvictThreshold = phi; } - public int getPhiConvictThreshold() + public double getPhiConvictThreshold() { return phiConvictThreshold; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f40c6e6/src/java/org/apache/cassandra/gms/FailureDetectorMBean.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/FailureDetectorMBean.java b/src/java/org/apache/cassandra/gms/FailureDetectorMBean.java index b065667..3b04c9f 100644 --- a/src/java/org/apache/cassandra/gms/FailureDetectorMBean.java +++ b/src/java/org/apache/cassandra/gms/FailureDetectorMBean.java @@ -24,9 +24,9 @@ public interface FailureDetectorMBean { public void dumpInterArrivalTimes(); - public void setPhiConvictThreshold(int phi); + public void setPhiConvictThreshold(double phi); - public int getPhiConvictThreshold(); + public double getPhiConvictThreshold(); public String getAllEndpointStates();
