You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/11/03 07:24:47 UTC
svn commit: r1196960 - in /cassandra/branches/cassandra-0.8: CHANGES.txt
src/java/org/apache/cassandra/service/RowRepairResolver.java
Author: jbellis
Date: Thu Nov 3 06:24:47 2011
New Revision: 1196960
URL: http://svn.apache.org/viewvc?rev=1196960&view=rev
Log:
no 0.8.9 yet
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/RowRepairResolver.java
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1196960&r1=1196959&r2=1196960&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Thu Nov 3 06:24:47 2011
@@ -1,8 +1,3 @@
-0.8.9
- * acquire compactionlock during truncate (CASSANDRA-3399)
- * fix displaying cfdef entries for super columnfamilies (CASSANDRA-3415)
-
-
0.8.8
* fix truncate allowing data to be replayed post-restart (CASSANDRA-3297)
* make iwriter final in IndexWriter to avoid NPE (CASSANDRA-2863)
@@ -40,6 +35,9 @@
* Fix race in AntiEntropyService (CASSANDRA-3400)
* fix updating CF row_cache_provider (CASSANDRA-3414)
* CFMetaData.convertToThrift method to set RowCacheProvider (CASSANDRA-3405)
+ * acquire compactionlock during truncate (CASSANDRA-3399)
+ * fix displaying cfdef entries for super columnfamilies (CASSANDRA-3415)
+
0.8.7
* Kill server on wrapped OOME such as from FileChannel.map (CASSANDRA-3201)
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/RowRepairResolver.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/RowRepairResolver.java?rev=1196960&r1=1196959&r2=1196960&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/RowRepairResolver.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/RowRepairResolver.java Thu Nov 3 06:24:47 2011
@@ -78,8 +78,7 @@ public class RowRepairResolver extends A
if (versions.size() > 1)
{
resolved = resolveSuperset(versions);
- if (logger.isDebugEnabled())
- logger.debug("versions merged");
+ logger.debug("versions merged to {}", resolved);
// resolved can be null even if versions doesn't have all nulls because of the call to removeDeleted in resolveSuperSet
if (resolved != null)
maybeScheduleRepairs(resolved, table, key, versions, endpoints);
@@ -104,7 +103,11 @@ public class RowRepairResolver extends A
{
ColumnFamily diffCf = ColumnFamily.diff(versions.get(i), resolved);
if (diffCf == null) // no repair needs to happen
+ {
+ if (logger.isDebugEnabled())
+ logger.debug("{} has the most recent version", endpoints.get(i));
continue;
+ }
// create and send the row mutation message based on the diff
RowMutation rowMutation = new RowMutation(table, key.key);
@@ -118,6 +121,8 @@ public class RowRepairResolver extends A
{
throw new IOError(e);
}
+ if (logger.isDebugEnabled())
+ logger.debug("read repair sending {} to {}", rowMutation, endpoints.get(i));
MessagingService.instance().sendOneWay(repairMessage, endpoints.get(i));
}
}