cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9
Date Thu, 11 Aug 2016 01:13:42 GMT
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 15fd71f9a3b07bbac7a1182f2e6bffd32e79b955
Parents: 1fff069 05483a9
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Thu Aug 11 09:11:11 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Committed: Thu Aug 11 09:11:11 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15fd71f9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 498868c,bd3bb75..bca8879
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,12 @@@
 -3.0.9
 +3.9
 + * Fix value skipping with counter columns (CASSANDRA-11726)
 + * Fix nodetool tablestats miss SSTable count (CASSANDRA-12205)
 + * Fixed flacky SSTablesIteratedTest (CASSANDRA-12282)
 + * Fixed flacky SSTableRewriterTest: check file counts before calling validateCFS (CASSANDRA-12348)
 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
 + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
 +Merged from 3.0:
+  * Make sure compaction stats are updated when compaction is interrupted (CASSANDRA-12100)
 - * Fix potential bad messaging service message for paged range reads
 -   within mixed-version 3.x clusters (CASSANDRA-12249)
   * Change commitlog and sstables to track dirty and clean intervals (CASSANDRA-11828)
   * NullPointerException during compaction on table with static columns (CASSANDRA-12336)
   * Fixed ConcurrentModificationException when reading metrics in GraphiteReporter (CASSANDRA-11823)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15fd71f9/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 86c8a8f,7e4ed41..2913dc9
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -170,13 -164,14 +170,14 @@@ public class CompactionTask extends Abs
                   AbstractCompactionStrategy.ScannerList scanners = strategy.getScanners(actuallyCompact);
                   CompactionIterator ci = new CompactionIterator(compactionType, scanners.scanners,
controller, nowInSec, taskId))
              {
-                 if (collector != null)
-                     collector.beginCompaction(ci);
                  long lastCheckObsoletion = start;
  
 -                if (!controller.cfs.getCompactionStrategyManager().isActive)
 +                if (!controller.cfs.getCompactionStrategyManager().isActive())
                      throw new CompactionInterruptedException(ci.getCompactionInfo());
  
+                 if (collector != null)
+                     collector.beginCompaction(ci);
+ 
                  try (CompactionAwareWriter writer = getCompactionAwareWriter(cfs, getDirectories(),
transaction, actuallyCompact))
                  {
                      estimatedKeys = writer.estimatedKeys();


Mime
View raw message