cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1195552 - /cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java
Date Mon, 31 Oct 2011 16:29:24 GMT
Author: jbellis
Date: Mon Oct 31 16:29:24 2011
New Revision: 1195552

URL: http://svn.apache.org/viewvc?rev=1195552&view=rev
Log:
r/m assert that is causing test problems (see #3116, #3399)

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java?rev=1195552&r1=1195551&r2=1195552&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/DataTracker.java Mon Oct 31 16:29:24
2011
@@ -296,11 +296,6 @@ public class DataTracker
 
     private void replace(Collection<SSTableReader> oldSSTables, Iterable<SSTableReader>
replacements)
     {
-        // removing sstables that are not marked compacting is a bug, since that means we
could
-        // race with a compaction check
-        for (SSTableReader sstable : oldSSTables)
-            assert view.get().compacting.contains(sstable);
-
         if (!cfstore.isValid())
         {
             removeOldSSTablesSize(replacements);



Mime
View raw message