Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0362B18FB5 for ; Fri, 15 Jan 2016 08:45:26 +0000 (UTC) Received: (qmail 56320 invoked by uid 500); 15 Jan 2016 08:45:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 56256 invoked by uid 500); 15 Jan 2016 08:45:25 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 56062 invoked by uid 99); 15 Jan 2016 08:45:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jan 2016 08:45:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6205ADFBE6; Fri, 15 Jan 2016 08:45:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Fri, 15 Jan 2016 08:45:29 -0000 Message-Id: <29ca25c3db5146de82779afeecb2d6e7@git.apache.org> In-Reply-To: <17980145a7cf4f7f87eef8493a3bc9d7@git.apache.org> References: <17980145a7cf4f7f87eef8493a3bc9d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/9] cassandra git commit: Log a message when a major compaction results in more than one sstable Log a message when a major compaction results in more than one sstable Patch by marcuse; reviewed by Sylvain Lebresne for CASSANDRA-10847 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03e6f450 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03e6f450 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03e6f450 Branch: refs/heads/trunk Commit: 03e6f450875173717014c2299915a10199307790 Parents: c42716f Author: Marcus Eriksson Authored: Mon Dec 14 14:29:23 2015 +0100 Committer: Marcus Eriksson Committed: Fri Jan 15 09:22:30 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/03e6f450/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 74fd45b..636c15d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.13 + * 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) fix formatting bytearray values (CASSANDRA-10839) * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686) http://git-wip-us.apache.org/repos/asf/cassandra/blob/03e6f450/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 30b8475..9e71ca0 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -534,9 +534,11 @@ public class CompactionManager implements CompactionManagerMBean return Collections.emptyList(); List> futures = new ArrayList<>(); - + int nonEmptyTasks = 0; for (final AbstractCompactionTask task : tasks) { + if (task.sstables.size() > 0) + nonEmptyTasks++; Runnable runnable = new WrappedRunnable() { protected void runMayThrow() throws IOException @@ -551,6 +553,8 @@ public class CompactionManager implements CompactionManagerMBean } 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."); return futures; }