You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2010/12/03 21:57:04 UTC
svn commit: r1041998 - in /cassandra: branches/cassandra-0.6/
branches/cassandra-0.6/src/java/org/apache/cassandra/gms/
branches/cassandra-0.7/
branches/cassandra-0.7/src/java/org/apache/cassandra/gms/
trunk/src/java/org/apache/cassandra/gms/
Author: brandonwilliams
Date: Fri Dec 3 20:57:03 2010
New Revision: 1041998
URL: http://svn.apache.org/viewvc?rev=1041998&view=rev
Log:
Reduce FatClient timeout to RING_DELAY / 2. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-1730.
Modified:
cassandra/branches/cassandra-0.6/CHANGES.txt
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=1041998&r1=1041997&r2=1041998&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Fri Dec 3 20:57:03 2010
@@ -12,6 +12,7 @@
with live subcolumn (CASSANDRA-1591)
* clean up log messages for gossip token notifications (CASSANDRA-1518)
* fix range queries against wrapped range (CASSANDRA-1781)
+ * reduce fat client timeout (CASSANDRA-1730)
0.6.8
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1041998&r1=1041997&r2=1041998&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java Fri Dec 3 20:57:03 2010
@@ -137,8 +137,8 @@ public class Gossiper implements IFailur
gossipTimer_ = new Timer(false);
// 3 days
aVeryLongTime_ = 259200 * 1000;
- // 1 hour
- FatClientTimeout_ = 60 * 60 * 1000;
+ // half of RING_DELAY, to ensure justRemovedEndpoints has enough leeway to prevent re-gossip
+ FatClientTimeout_ = (long)(StorageService.RING_DELAY / 2);
/* register with the Failure Detector for receiving Failure detector events */
FailureDetector.instance.registerFailureDetectionEventListener(this);
}
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1041998&r1=1041997&r2=1041998&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Fri Dec 3 20:57:03 2010
@@ -31,6 +31,7 @@ dev
immediately if insufficient live nodes exist (CASSANDRA-1803)
* copy bytebuffers for local writes to avoid retaining the entire
Thrift frame (CASSANDRA-1801)
+ * reduce fat client timeout (CASSANDRA-1730)
0.7.0-rc1
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1041998&r1=1041997&r2=1041998&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/gms/Gossiper.java Fri Dec 3 20:57:03 2010
@@ -145,8 +145,8 @@ public class Gossiper implements IFailur
{
// 3 days
aVeryLongTime_ = 259200 * 1000;
- // 1 hour
- FatClientTimeout_ = 60 * 60 * 1000;
+ // half of RING_DELAY, to ensure justRemovedEndpoints has enough leeway to prevent re-gossip
+ FatClientTimeout_ = (long)(StorageService.RING_DELAY / 2);
/* register with the Failure Detector for receiving Failure detector events */
FailureDetector.instance.registerFailureDetectionEventListener(this);
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1041998&r1=1041997&r2=1041998&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Fri Dec 3 20:57:03 2010
@@ -145,8 +145,8 @@ public class Gossiper implements IFailur
{
// 3 days
aVeryLongTime_ = 259200 * 1000;
- // 1 hour
- FatClientTimeout_ = 60 * 60 * 1000;
+ // half of RING_DELAY, to ensure justRemovedEndpoints has enough leeway to prevent re-gossip
+ FatClientTimeout_ = (long)(StorageService.RING_DELAY / 2);
/* register with the Failure Detector for receiving Failure detector events */
FailureDetector.instance.registerFailureDetectionEventListener(this);
}