Author: jbellis
Date: Thu May 5 15:42:56 2011
New Revision: 1099849
URL: http://svn.apache.org/viewvc?rev=1099849&view=rev
Log:
snapshot_before_compaction directoryname fix
patch by jbellis; reviewed by mck for CASSANDRA-2598
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CompactionManager.java
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1099849&r1=1099848&r2=1099849&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Thu May 5 15:42:56 2011
@@ -3,6 +3,7 @@
rebuffering in BRAF (CASSANDRA-2581)
* fix returning null column values in the python cql driver (CASSANDRA-2593)
* fix merkle tree splitting exiting early (CASSANDRA-2605)
+ * snapshot_before_compaction directory name fix (CASSANDRA-2598)
0.8.0-beta2
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=1099849&r1=1099848&r2=1099849&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
Thu May 5 15:42:56 2011
@@ -523,7 +523,7 @@ public class CompactionManager implement
Table table = cfs.table;
if (DatabaseDescriptor.isSnapshotBeforeCompaction())
- table.snapshot("compact-" + cfs.columnFamily);
+ table.snapshot(System.currentTimeMillis() + "-" + "compact-" +
cfs.columnFamily);
// sanity check: all sstables must belong to the same cfs
for (SSTableReader sstable : sstables)
