Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ensure that the sstables we unmark compacting, are the same ones we m…

…arked
  • Loading branch information...
commit a393072aac6292412fc465d207c411c4b6b69e0b 1 parent 38fdcd1
@jbellis jbellis authored
Showing with 3 additions and 5 deletions.
  1. +3 −5 src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View
8 src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -30,10 +30,7 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
+import com.google.common.collect.*;
import com.google.common.util.concurrent.Futures;
import org.apache.cassandra.db.compaction.*;
@@ -61,6 +58,7 @@
import org.apache.cassandra.db.index.SecondaryIndexManager;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.dht.*;
+import org.apache.cassandra.dht.Range;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.FSReadError;
import org.apache.cassandra.io.compress.CompressionParameters;
@@ -1908,7 +1906,7 @@ public CFMetaData apply(ColumnFamilyStore cfs)
public Iterable<SSTableReader> call() throws Exception
{
assert data.getCompacting().isEmpty() : data.getCompacting();
- Iterable<SSTableReader> sstables = AbstractCompactionStrategy.filterSuspectSSTables(getSSTables());
+ Iterable<SSTableReader> sstables = Lists.newArrayList(AbstractCompactionStrategy.filterSuspectSSTables(getSSTables()));
if (Iterables.isEmpty(sstables))
return null;
boolean success = data.markCompacting(sstables);
Please sign in to comment.
Something went wrong with that request. Please try again.