Repository: cassandra Updated Branches: refs/heads/trunk 8825dee9d -> 95469455e
Use configured gcgs when anticompacting Patch by marcuse; reviewed by jbellis for CASSANDRA-9397 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bdbc61ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bdbc61ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bdbc61ff Branch: refs/heads/trunk Commit: bdbc61ff722db1ad7a0803ba82024345adb17f2a Parents: 8ad70cf Author: Marcus Eriksson <[email protected]> Authored: Fri May 15 07:56:19 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon May 18 06:43:10 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdbc61ff/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c85d031..198935b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.6 + * Use configured gcgs in anticompaction (CASSANDRA-9397) * Warn on misuse of unlogged batches (CASSANDRA-9282) * Failure detector detects and ignores local pauses (CASSANDRA-9183) * Add utility class to support for rate limiting a given log statement (CASSANDRA-9029) http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdbc61ff/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index cc0dde0..c7232a0 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -1072,7 +1072,7 @@ public class CompactionManager implements CompactionManagerMBean SSTableRewriter unRepairedSSTableWriter = new SSTableRewriter(cfs, sstableAsSet, sstable.maxDataAge, false); try (AbstractCompactionStrategy.ScannerList scanners = cfs.getCompactionStrategy().getScanners(new HashSet<>(Collections.singleton(sstable))); - CompactionController controller = new CompactionController(cfs, sstableAsSet, CFMetaData.DEFAULT_GC_GRACE_SECONDS)) + CompactionController controller = new CompactionController(cfs, sstableAsSet, getDefaultGcBefore(cfs))) { int expectedBloomFilterSize = Math.max(cfs.metadata.getMinIndexInterval(), (int)sstable.estimatedKeys()); repairedSSTableWriter.switchWriter(CompactionManager.createWriter(cfs, destination, expectedBloomFilterSize, repairedAt, sstable));
