Updated Branches: refs/heads/cassandra-1.2 7e057f504 -> a9b403e64
remove calculation of unused expected compacted filesize Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9b403e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9b403e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9b403e6 Branch: refs/heads/cassandra-1.2 Commit: a9b403e649aaa4de5e28d3bd4c562568d0ae3fbc Parents: 7e057f5 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Oct 21 18:54:01 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Oct 21 18:54:01 2013 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9b403e6/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 b34856e..d26a072 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -582,8 +582,7 @@ public class CompactionManager implements CompactionManagerMBean SSTableReader newSstable = null; logger.info("Cleaning up " + sstable); - // Calculate the expected compacted filesize - long expectedRangeFileSize = cfs.getExpectedCompactedFileSize(Arrays.asList(sstable), OperationType.CLEANUP); + File compactionFileLocation = cfs.directories.getDirectoryForNewSSTables(); if (compactionFileLocation == null) throw new IOException("disk full");
