You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/01/03 22:40:48 UTC
git commit: Ninja fix CFS.removeUnfinishedCompactionLeftovers()
Updated Branches:
refs/heads/trunk 4260736e1 -> b65481b1d
Ninja fix CFS.removeUnfinishedCompactionLeftovers()
ninja patch by Benedict Elliott Smith; ninja reviewed by Aleksey
Yeschenko
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b65481b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b65481b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b65481b1
Branch: refs/heads/trunk
Commit: b65481b1d09c9829521aac838a2d9e082eaf2154
Parents: 4260736
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Jan 4 00:39:11 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Jan 4 00:39:11 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b65481b1/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 665b4b6..2389d97 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -501,7 +501,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
// remove new sstables from compactions that didn't complete, and compute
// set of ancestors that shouldn't exist anymore
Set<Integer> completedAncestors = new HashSet<>();
- for (Map.Entry<Descriptor, Set<Component>> sstableFiles : directories.sstableLister().list().entrySet())
+ for (Map.Entry<Descriptor, Set<Component>> sstableFiles : directories.sstableLister().skipTemporary(true).list().entrySet())
{
Descriptor desc = sstableFiles.getKey();