Permalink
Browse files

Fix compaction_history timestamps

patch by Chander Pechetty and jbellis for CASSANDRA-6784
  • Loading branch information...
1 parent 4eb21ea commit 319b42e58c3cc1b3d0ff2b87102e0b5f35169932 @jbellis jbellis committed Feb 28, 2014
Showing with 2 additions and 1 deletion.
  1. +1 −0 CHANGES.txt
  2. +1 −1 src/java/org/apache/cassandra/db/compaction/CompactionTask.java
View
@@ -1,6 +1,7 @@
2.0.6
* Pool CqlRecordWriter clients by inetaddress rather than Range
(CASSANDRA-6665)
+ * Fix compaction_history timestamps (CASSANDRA-6784)
* Compare scores of full replica ordering in DES (CASSANDRA-6883)
* fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577)
* Allow repairing between specific replicas (CASSANDRA-6440)
@@ -271,7 +271,7 @@ protected void runWith(File sstableDirectory) throws Exception
mergedRows.put(rows, count);
}
- SystemKeyspace.updateCompactionHistory(cfs.keyspace.getName(), cfs.name, start, startsize, endsize, mergedRows);
+ SystemKeyspace.updateCompactionHistory(cfs.keyspace.getName(), cfs.name, System.currentTimeMillis(), startsize, endsize, mergedRows);
logger.info(String.format("Compacted %d sstables to [%s]. %,d bytes to %,d (~%d%% of original) in %,dms = %fMB/s. %,d total partitions merged to %,d. Partition merge counts were {%s}",
toCompact.size(), builder.toString(), startsize, endsize, (int) (ratio * 100), dTime, mbps, totalSourceRows, totalkeysWritten, mergeSummary.toString()));
logger.debug(String.format("CF Total Bytes Compacted: %,d", CompactionTask.addToTotalBytesCompacted(endsize)));

0 comments on commit 319b42e

Please sign in to comment.