Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c35484ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c35484ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c35484ad Branch: refs/heads/cassandra-3.3 Commit: c35484ad15422b1e378e596407237e02463da0d4 Parents: ed13e05 e0c27bc Author: Marcus Eriksson <[email protected]> Authored: Fri Jan 15 09:33:02 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Fri Jan 15 09:33:43 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/compaction/CompactionManager.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c35484ad/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4c44120,8c3527f..9bc1349 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -18,7 -26,16 +18,8 @@@ Merged from 2.2 * Optimize pending range computation (CASSANDRA-9258) * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) * drop/alter user should be case sensitive (CASSANDRA-10817) - * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) - * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) - * Add new types to Stress (CASSANDRA-9556) - * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: + * Log a message when major compaction does not result in a single file (CASSANDRA-10847) * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997) * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686) * Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c35484ad/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 3e7b198,086f358..6c02e9b --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@@ -652,6 -582,8 +654,8 @@@ public class CompactionManager implemen } futures.add(executor.submit(runnable)); } + if (nonEmptyTasks > 1) - logger.info("Cannot perform a full major compaction as repaired and unrepaired sstables cannot be compacted together. These two set of sstables will be compacted separately."); ++ logger.info("Major compaction will not result in a single sstable - repaired and unrepaired data is kept separate and compaction runs per data_file_directory."); return futures; }
