cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject git commit: Make sure we don't try to compact already compacting sstables in HHOM
Date Wed, 28 May 2014 05:46:01 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.0 81286b0ca -> 54618a1b3


Make sure we don't try to compact already compacting sstables in HHOM

Patch by marcuse; reviewed by jbellis for CASSANDRA-7288


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54618a1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54618a1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54618a1b

Branch: refs/heads/cassandra-2.0
Commit: 54618a1b3eb3783643d450b28e40862f3bed45c3
Parents: 81286b0
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue May 27 11:12:27 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed May 28 07:43:47 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/db/HintedHandOffManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/54618a1b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6a16cae..2b8ce60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
  * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
  * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
  * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
+ * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 
 2.0.8
  * Always reallocate buffers in HSHA (CASSANDRA-6285)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/54618a1b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 13d1bb0..158f6ad 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -254,7 +254,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
     {
         hintStore.forceBlockingFlush();
         ArrayList<Descriptor> descriptors = new ArrayList<Descriptor>();
-        for (SSTable sstable : hintStore.getSSTables())
+        for (SSTable sstable : hintStore.getDataTracker().getUncompactingSSTables())
             descriptors.add(sstable.descriptor);
         return CompactionManager.instance.submitUserDefined(hintStore, descriptors, (int)
(System.currentTimeMillis() / 1000));
     }


Mime
View raw message