Author: jbellis
Date: Tue May 24 13:28:35 2011
New Revision: 1127034
URL: http://svn.apache.org/viewvc?rev=1127034&view=rev
Log:
add special case message for attempted compaction of < 2 sstables
patch by jbellis for CASSANDRA-2697
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1127034&r1=1127033&r2=1127034&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java
Tue May 24 13:28:35 2011
@@ -490,6 +490,12 @@ public class CompactionManager implement
int doCompaction(ColumnFamilyStore cfs, Collection<SSTableReader>
sstables, int gcBefore) throws IOException
{
+ if (sstables.size() < 2)
+ {
+ logger.info("Nothing to compact in " + cfs.getColumnFamilyName() +
"; use forceUserDefinedCompaction if you wish to force compaction of single
sstables (e.g. for tombstone collection)");
+ return 0;
+ }
+
Table table = cfs.table;
// If the compaction file path is null that means we have no space
left for this compaction.
