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 BD29C107A7 for ; Tue, 6 Aug 2013 21:56:18 +0000 (UTC) Received: (qmail 4224 invoked by uid 500); 6 Aug 2013 21:56:17 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 4174 invoked by uid 500); 6 Aug 2013 21:56:17 -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 3990 invoked by uid 99); 6 Aug 2013 21:56:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Aug 2013 21:56:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5FABB1B9FC; Tue, 6 Aug 2013 21:56:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Tue, 06 Aug 2013 21:56:21 -0000 Message-Id: <165603a981d54dcfa47c2390ab17b4b1@git.apache.org> In-Reply-To: <964e74adefa941b6a45630554969207b@git.apache.org> References: <964e74adefa941b6a45630554969207b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/17] git commit: catch all Throwables, not just Exceptions catch all Throwables, not just Exceptions Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/238139cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/238139cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/238139cd Branch: refs/heads/cassandra-2.0.0 Commit: 238139cda53eae51516c477f7ac10c5397df02a4 Parents: 155afa1 Author: Jonathan Ellis Authored: Tue Aug 6 16:55:20 2013 -0500 Committer: Jonathan Ellis Committed: Tue Aug 6 16:55:20 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 69df3de..75b349f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +1.1.next + * Backport compaction exception handling from 1.2 + + 1.1.12 * Remove buggy thrift max message length option (CASSANDRA-5529) * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java index 02d20cf..b467a2f 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.util.*; import com.google.common.base.Predicates; +import com.google.common.base.Throwables; import com.google.common.collect.Iterators; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -188,7 +189,7 @@ public class CompactionTask extends AbstractCompactionTask for (SSTableWriter completedWriter : writers) sstables.add(completedWriter.closeAndOpenReader(maxAge)); } - catch (Exception e) + catch (Throwable t) { for (SSTableWriter writer : writers) writer.abort(); @@ -198,7 +199,7 @@ public class CompactionTask extends AbstractCompactionTask sstable.markCompacted(); sstable.releaseReference(); } - throw FBUtilities.unchecked(e); + throw Throwables.propagate(t); } finally {