You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/08/14 23:22:22 UTC
[1/6] git commit: Fix NPE at compaction leftover cleanup for dropped
table
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 27cbf5534 -> a816e09d8
refs/heads/cassandra-2.1.0 e4e56c2fd -> 254df46b1
refs/heads/trunk c4077ad66 -> a712cd15b
Fix NPE at compaction leftover cleanup for dropped table
patch by yukim; reviewed by jbellis for CASSANDRA-7770
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/254df46b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/254df46b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/254df46b
Branch: refs/heads/cassandra-2.1
Commit: 254df46b19ea574084b9e5dd6810cdc403d16720
Parents: e4e56c2
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 14 16:20:52 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 14 16:20:52 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 058681a..7c54a9e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@
* Fix binding null values inside UDT (CASSANDRA-7685)
* Fix UDT field selection with empty fields (CASSANDRA-7670)
* Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+ * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
Merged from 2.0:
* Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 7c85f81..a0dacee 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -242,7 +242,9 @@ public class CassandraDaemon
for (Pair<String, String> kscf : unfinishedCompactions.keySet())
{
CFMetaData cfm = Schema.instance.getCFMetaData(kscf.left, kscf.right);
- ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf));
+ // CFMetaData can be null if CF is already dropped
+ if (cfm != null)
+ ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf));
}
SystemKeyspace.discardCompactionsInProgress();
[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a816e09d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a816e09d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a816e09d
Branch: refs/heads/trunk
Commit: a816e09d8b7b903d9998cfe8cb895caea54fcae3
Parents: 27cbf55 254df46
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 14 16:21:59 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 14 16:21:59 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a816e09d/CHANGES.txt
----------------------------------------------------------------------
[2/6] git commit: Fix NPE at compaction leftover cleanup for dropped
table
Posted by yu...@apache.org.
Fix NPE at compaction leftover cleanup for dropped table
patch by yukim; reviewed by jbellis for CASSANDRA-7770
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/254df46b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/254df46b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/254df46b
Branch: refs/heads/cassandra-2.1.0
Commit: 254df46b19ea574084b9e5dd6810cdc403d16720
Parents: e4e56c2
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 14 16:20:52 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 14 16:20:52 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 058681a..7c54a9e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@
* Fix binding null values inside UDT (CASSANDRA-7685)
* Fix UDT field selection with empty fields (CASSANDRA-7670)
* Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+ * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
Merged from 2.0:
* Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 7c85f81..a0dacee 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -242,7 +242,9 @@ public class CassandraDaemon
for (Pair<String, String> kscf : unfinishedCompactions.keySet())
{
CFMetaData cfm = Schema.instance.getCFMetaData(kscf.left, kscf.right);
- ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf));
+ // CFMetaData can be null if CF is already dropped
+ if (cfm != null)
+ ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf));
}
SystemKeyspace.discardCompactionsInProgress();
[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a816e09d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a816e09d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a816e09d
Branch: refs/heads/cassandra-2.1
Commit: a816e09d8b7b903d9998cfe8cb895caea54fcae3
Parents: 27cbf55 254df46
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 14 16:21:59 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 14 16:21:59 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a816e09d/CHANGES.txt
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a712cd15
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a712cd15
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a712cd15
Branch: refs/heads/trunk
Commit: a712cd15bcd3836ec5ea78cfaa5cf5e3afb306b1
Parents: c4077ad a816e09
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 14 16:22:05 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 14 16:22:05 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a712cd15/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a712cd15/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
[3/6] git commit: Fix NPE at compaction leftover cleanup for dropped
table
Posted by yu...@apache.org.
Fix NPE at compaction leftover cleanup for dropped table
patch by yukim; reviewed by jbellis for CASSANDRA-7770
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/254df46b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/254df46b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/254df46b
Branch: refs/heads/trunk
Commit: 254df46b19ea574084b9e5dd6810cdc403d16720
Parents: e4e56c2
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 14 16:20:52 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 14 16:20:52 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 058681a..7c54a9e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,7 @@
* Fix binding null values inside UDT (CASSANDRA-7685)
* Fix UDT field selection with empty fields (CASSANDRA-7670)
* Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+ * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770)
Merged from 2.0:
* Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478)
* Clone token map outside of hot gossip loops (CASSANDRA-7758)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 7c85f81..a0dacee 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -242,7 +242,9 @@ public class CassandraDaemon
for (Pair<String, String> kscf : unfinishedCompactions.keySet())
{
CFMetaData cfm = Schema.instance.getCFMetaData(kscf.left, kscf.right);
- ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf));
+ // CFMetaData can be null if CF is already dropped
+ if (cfm != null)
+ ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf));
}
SystemKeyspace.discardCompactionsInProgress();