svn commit: r1135288 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/db/DataTracker.java

[jb...@apache.org]

Author: jbellis
Date: Mon Jun 13 21:22:15 2011
New Revision: 1135288

URL: http://svn.apache.org/viewvc?rev=1135288&view=rev
Log:
avoid marking entirelist ofsstables as actively being compacted
patch by Ben Coverston and jbellis for CASSANDRA-2765

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/DataTracker.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1135288&r1=1135287&r2=1135288&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon Jun 13 21:22:15 2011
@@ -49,6 +49,8 @@
    supercolumn tombstone during replica resolution (CASSANDRA-2590)
  * support sstable2json against snapshot sstables (CASSANDRA-2386)
  * remove active-pull schema requests (CASSANDRA-2715)
+ * avoid marking entire list of sstables as actively being compacted
+   in multithreaded compaction (CASSANDRA-2765)
 
 
 0.8.0-final

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/DataTracker.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/DataTracker.java?rev=1135288&r1=1135287&r2=1135288&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/DataTracker.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/DataTracker.java Mon Jun 13 21:22:15 2011
@@ -483,7 +483,7 @@ public class    DataTracker
 
         public View markCompacting(Collection<SSTableReader> tomark)
         {
-            Set<SSTableReader> compactingNew = ImmutableSet.<SSTableReader>builder().addAll(sstables).addAll(tomark).build();
+            Set<SSTableReader> compactingNew = ImmutableSet.<SSTableReader>builder().addAll(compacting).addAll(tomark).build();
             return new View(memtable, memtablesPendingFlush, sstables, compactingNew);
         }