cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r930961 - in /cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/service/AntiEntropyService.java
Date Mon, 05 Apr 2010 21:04:28 GMT
Author: jbellis
Date: Mon Apr  5 21:04:27 2010
New Revision: 930961

URL: http://svn.apache.org/viewvc?rev=930961&view=rev
Log:
perform repair even for small entropy differences.  patch by Stu Hood; reviewed by jbellis
for CASSANDRA-924

Modified:
    cassandra/branches/cassandra-0.6/CHANGES.txt
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java

Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=930961&r1=930960&r2=930961&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Mon Apr  5 21:04:27 2010
@@ -7,6 +7,7 @@
  * fix race condition that could trigger a false-positive assertion
    during post-flush discard of old commitlog segments (CASSANDRA-936)
  * fix neighbor calculation for anti-entropy repair (CASSANDRA-924)
+ * perform repair even for small entropy differences (CASSANDRA-924)
 
 
 0.6.0-RC1

Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=930961&r1=930960&r2=930961&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java
(original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java
Mon Apr  5 21:04:27 2010
@@ -589,11 +589,8 @@ public class AntiEntropyService
                     logger.debug("Endpoints " + local + " and " + remote + " are consistent
for " + cf);
                     return;
                 }
-
-                if (difference < 0.05)
-                    performRangeRepair();
-                else
-                    performStreamingRepair();
+                
+                performStreamingRepair();
             }
             catch(IOException e)
             {
@@ -614,17 +611,6 @@ public class AntiEntropyService
         }
 
         /**
-         * Sends our list of differences to the remote endpoint using read
-         * repairs via the query API.
-         */
-        void performRangeRepair() throws IOException
-        {
-            logger.info("Performing range read repair of " + differences.size() + " ranges
for " + cf);
-            // FIXME
-            logger.debug("Finished range read repair for " + cf);
-        }
-
-        /**
          * Sends our list of differences to the remote endpoint using the
          * Streaming API.
          */



Mime
View raw message