Updated Branches: refs/heads/cassandra-1.2 94d7cb411 -> d735cfdcc refs/heads/trunk cb981e624 -> 181f3736c
Allow compacting 2Is via nodetool patch by jasobrown; reviewed by jbellis for CASSANDRA-5670 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94d7cb41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94d7cb41 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94d7cb41 Branch: refs/heads/trunk Commit: 94d7cb411b21c1a8a4d7c3d375dfd09f4dc3f885 Parents: 97bc9c7 Author: Jason Brown <jasedbr...@gmail.com> Authored: Tue Jul 30 12:52:03 2013 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Jul 30 13:35:15 2013 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/94d7cb41/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8578855..1497299 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,7 @@ * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter (CASSANDRA-5824) * update default LCS sstable size to 160MB (CASSANDRA-5727) + * Allow compacting 2Is via nodetool (CASSANDRA-5670) 1.2.8 http://git-wip-us.apache.org/repos/asf/cassandra/blob/94d7cb41/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 26c4d1c..54f8abd 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -2165,7 +2165,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE public void forceTableCompaction(String tableName, String... columnFamilies) throws IOException, ExecutionException, InterruptedException { - for (ColumnFamilyStore cfStore : getValidColumnFamilies(false, false, tableName, columnFamilies)) + for (ColumnFamilyStore cfStore : getValidColumnFamilies(true, false, tableName, columnFamilies)) { cfStore.forceMajorCompaction(); }
