Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a09fafe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a09fafe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a09fafe Branch: refs/heads/cassandra-3.11 Commit: 5a09fafea043d472f2d46b1e17062201f7baa38a Parents: 2b29f8a fb92a52 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Sep 5 10:39:02 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Sep 5 10:39:02 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/sstable/format/SSTableReader.java | 8 +- .../sstable/IndexSummaryRedistributionTest.java | 142 +++++++++++++++++++ 3 files changed, 147 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a09fafe/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a09fafe/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 03af2bb,25ba212..5d76f75 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java @@@ -1143,13 -1116,17 +1143,13 @@@ public abstract class SSTableReader ext "no adjustments to min/max_index_interval"); } - //Always save the resampled index - try(SegmentedFile.Builder ibuilder = SegmentedFile.getBuilder(DatabaseDescriptor.getIndexAccessMode(), false); - SegmentedFile.Builder dbuilder = SegmentedFile.getBuilder(DatabaseDescriptor.getDiskAccessMode(), compression)) - { - saveSummary(ibuilder, dbuilder, newSummary); - } + // Always save the resampled index + saveSummary(newSummary); - long newSize = bytesOnDisk(); - StorageMetrics.load.inc(newSize - oldSize); - parent.metric.liveDiskSpaceUsed.inc(newSize - oldSize); - parent.metric.totalDiskSpaceUsed.inc(newSize - oldSize); + // The new size will be added in Transactional.commit() as an updated SSTable, more details: CASSANDRA-13738 + StorageMetrics.load.dec(oldSize); + parent.metric.liveDiskSpaceUsed.dec(oldSize); + parent.metric.totalDiskSpaceUsed.dec(oldSize); return cloneAndReplace(first, OpenReason.METADATA_CHANGE, newSummary); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
