natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change snapshot-before-compaction to only snapshot (w/o flush) CFS being compacted 

patch by jbellis; reviewed by slebresne for CASSANDRA-3803
This commit is contained in:
Jonathan Ellis 2012-02-05 14:23:35 -06:00
parent d9ed037878
commit 22b8a9725b
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.txt
View File

@ -1,3 +1,8 @@
1.0.9
* Only snapshot CF being compacted for snapshot_before_compaction
(CASSANDRA-3803)
1.0.8 1.0.8
* Log active compactions in StatusLogger (CASSANDRA-3703) * Log active compactions in StatusLogger (CASSANDRA-3703)
* Compute more accurate compaction score per level (CASSANDRA-3790) * Compute more accurate compaction score per level (CASSANDRA-3790)

2
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -1389,7 +1389,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
return metadata.comparator; return metadata.comparator;
} }
private void snapshotWithoutFlush(String snapshotName) public void snapshotWithoutFlush(String snapshotName)
{ {
for (ColumnFamilyStore cfs : concatWithIndexes()) for (ColumnFamilyStore cfs : concatWithIndexes())
{ {

2
src/java/org/apache/cassandra/db/compaction/CompactionTask.java
View File

@ -100,7 +100,7 @@ public class CompactionTask extends AbstractCompactionTask
} }
if (DatabaseDescriptor.isSnapshotBeforeCompaction()) if (DatabaseDescriptor.isSnapshotBeforeCompaction())
cfs.table.snapshot(System.currentTimeMillis() + "-" + "compact-" + cfs.columnFamily); cfs.snapshotWithoutFlush(System.currentTimeMillis() + "-" + "compact-" + cfs.columnFamily);
// sanity check: all sstables must belong to the same cfs // sanity check: all sstables must belong to the same cfs
for (SSTableReader sstable : toCompact) for (SSTableReader sstable : toCompact)