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 293BD17378 for ; Mon, 9 Mar 2015 17:36:11 +0000 (UTC) Received: (qmail 31316 invoked by uid 500); 9 Mar 2015 17:36:11 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 31273 invoked by uid 500); 9 Mar 2015 17:36:11 -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 31261 invoked by uid 99); 9 Mar 2015 17:36:10 -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; Mon, 09 Mar 2015 17:36:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D7C00E180D; Mon, 9 Mar 2015 17:36:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmckenzie@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: Make logging for NPE in removeUnfinishedCompactionLeftovers more useful Date: Mon, 9 Mar 2015 17:36:10 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 107545b39 -> 9ee34b6e6 Make logging for NPE in removeUnfinishedCompactionLeftovers more useful Patch by jmckenzie; reviewed by ayeschenko for CASSANDRA-8544 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ee34b6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ee34b6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ee34b6e Branch: refs/heads/cassandra-2.1 Commit: 9ee34b6e656428299a98eb2f1403b2246be3190f Parents: 107545b Author: Joshua McKenzie Authored: Mon Mar 9 12:33:57 2015 -0500 Committer: Joshua McKenzie Committed: Mon Mar 9 12:33:57 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ee34b6e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 1f03090..3d5e4c2 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -612,6 +612,10 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean { throw new FSReadError(e, desc.filenameFor(Component.STATS)); } + catch (NullPointerException e) + { + throw new FSReadError(e, "Failed to remove unfinished compaction leftovers (file: " + desc.filenameFor(Component.STATS) + "). See log for details."); + } if (!ancestors.isEmpty() && unfinishedGenerations.containsAll(ancestors)