cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject cassandra git commit: Make logging for NPE in removeUnfinishedCompactionLeftovers more useful
Date Mon, 09 Mar 2015 17:36:10 GMT
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 <jmckenzie@apache.org>
Authored: Mon Mar 9 12:33:57 2015 -0500
Committer: Joshua McKenzie <jmckenzie@apache.org>
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)


Mime
View raw message