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 2011/07/29 01:42:47 UTC
svn commit: r1152038 -
/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
Author: brandonwilliams
Date: Thu Jul 28 23:42:47 2011
New Revision: 1152038
URL: http://svn.apache.org/viewvc?rev=1152038&view=rev
Log:
DES shouldn't ignore nodes when the read repair chance is zero.
Patch by brandonwilliams reviewed by Paul Cannon for CASSANDRA-2662
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java?rev=1152038&r1=1152037&r2=1152038&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java Thu Jul 28 23:42:47 2011
@@ -178,8 +178,20 @@ public class DynamicEndpointSnitch exten
{
Double scored1 = scores.get(a1);
Double scored2 = scores.get(a2);
+
+ if (scored1 == null)
+ {
+ scored1 = 0.0;
+ receiveTiming(a1, 0.0);
+ }
+
+ if (scored2 == null)
+ {
+ scored2 = 0.0;
+ receiveTiming(a2, 0.0);
+ }
- if (scored1 == null || scored2 == null || scored1.equals(scored2))
+ if (scored1.equals(scored2))
return subsnitch.compareEndpoints(target, a1, a2);
if (scored1 < scored2)
return -1;