Repository: cassandra Updated Branches: refs/heads/trunk 50c5da991 -> 68371c655
Track added size correctly Patch by marcuse; reviewed by jbellis for CASSANDRA-7239 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c3a3e13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c3a3e13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c3a3e13 Branch: refs/heads/trunk Commit: 6c3a3e130130e2823ba71ecd8a0e2680de23efd5 Parents: aca80da Author: Marcus Eriksson <[email protected]> Authored: Fri Oct 3 11:05:54 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Oct 6 12:43:19 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DataTracker.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c3a3e13/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index beab957..7cce86e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.1 + * Properly track added size (CASSANDRA-7239) * Allow compilation in java 8 (CASSANDRA-7208) * Fix Assertion error on RangeTombstoneList diff (CASSANDRA-8013) * Release references to overlapping sstables during compaction (CASSANDRA-7819) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c3a3e13/src/java/org/apache/cassandra/db/DataTracker.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java index 8d66e2a..f09c725 100644 --- a/src/java/org/apache/cassandra/db/DataTracker.java +++ b/src/java/org/apache/cassandra/db/DataTracker.java @@ -264,7 +264,7 @@ public class DataTracker { replace(sstables, Collections.<SSTableReader>emptyList()); notifySSTablesChanged(sstables, allReplacements, compactionType); - for (SSTableReader sstable : sstables) + for (SSTableReader sstable : allReplacements) { long bytesOnDisk = sstable.bytesOnDisk(); cfstore.metric.totalDiskSpaceUsed.inc(bytesOnDisk);
