cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Mon, 08 Feb 2016 08:05:34 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/cassandra-3.0
Commit: 6982aaad85451711a8257a0046b6fc6f17db0b7c
Parents: 6622970 dd23adf
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Feb 8 08:55:10 2016 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Feb 8 08:55:10 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                               |  4 ++++
 .../db/compaction/DateTieredCompactionStrategy.java       | 10 ++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6982aaad/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0d98779,054ad1d..12198e4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,5 +1,39 @@@
 -2.1.13
 +2.2.6
 + * Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
 + * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010)
++Merged from 2.1:
+  * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
++
++
 +2.2.5
 + * maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
 + * Apply change to compaction throughput in real time (CASSANDRA-10025)
 + * Fix potential NPE on ORDER BY queries with IN (CASSANDRA-10955)
 + * Avoid over-fetching during the page of range queries (CASSANDRA-8521)
 + * Start L0 STCS-compactions even if there is a L0 -> L1 compaction
 +   going (CASSANDRA-10979)
 + * Make UUID LSB unique per process (CASSANDRA-7925)
 + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
 + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
 + * Fix error streaming section more than 2GB (CASSANDRA-10961)
 + * (cqlsh) Also apply --connect-timeout to control connection
 +   timeout (CASSANDRA-10959)
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 + * (cqlsh) encode input correctly when saving history
 +Merged from 2.1:
   * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
   * Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
   * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6982aaad/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
index e2d884f,64a599d..8c59e1a
--- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
@@@ -386,14 -383,14 +386,16 @@@ public class DateTieredCompactionStrate
      }
  
      @Override
 -    public synchronized Collection<AbstractCompactionTask> getMaximalTask(int gcBefore)
 +    @SuppressWarnings("resource")
 +    public synchronized Collection<AbstractCompactionTask> getMaximalTask(int gcBefore,
boolean splitOutput)
      {
-         LifecycleTransaction modifier = cfs.markAllCompacting(OperationType.COMPACTION);
-         if (modifier == null)
+         Iterable<SSTableReader> filteredSSTables = filterSuspectSSTables(sstables);
+         if (Iterables.isEmpty(filteredSSTables))
              return null;
- 
-         return Collections.<AbstractCompactionTask>singleton(new CompactionTask(cfs,
modifier, gcBefore, false));
 -        if (!cfs.getDataTracker().markCompacting(ImmutableList.copyOf(filteredSSTables)))
++        LifecycleTransaction txn = cfs.getTracker().tryModify(filteredSSTables, OperationType.COMPACTION);
++        if (txn == null)
+             return null;
 -        return Collections.<AbstractCompactionTask>singleton(new CompactionTask(cfs,
filteredSSTables, gcBefore, false));
++        return Collections.<AbstractCompactionTask>singleton(new CompactionTask(cfs,
txn, gcBefore, false));
      }
  
      @Override


Mime
View raw message