cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [10/15] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 26 May 2016 00:14:06 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/trunk
Commit: ed84bbcbb1c80941f7a5d948799b90c8c1740edb
Parents: d63ede5 907c826
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed May 25 18:54:08 2016 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed May 25 18:54:08 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +-
 .../org/apache/cassandra/dht/BootStrapper.java  |  1 +
 .../org/apache/cassandra/dht/RangeStreamer.java | 48 +++++++++++++++-----
 .../cassandra/service/StorageService.java       |  2 +-
 4 files changed, 41 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed84bbcb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7239dc9,d6750ab..0277f16
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,40 -1,9 +1,41 @@@
 -2.2.7
 +3.0.7
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
   * Enable client encryption in sstableloader with cli options (CASSANDRA-11708)
   * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
-  * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
 - * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 - * Prohibit Reverse Counter type as part of the PK (CASSANDRA-9395)
 + * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
 +Merged from 2.1:
++ * Do not consider local node a valid source during replace (CASSANDRA-11848)
++ * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)
 + * Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739)
 +
 +
 +3.0.6
 + * Disallow creating view with a static column (CASSANDRA-11602)
 + * Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593)
 + * Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618)
 + * Fix queries with filtering on counter columns (CASSANDRA-11629)
 + * Improve tombstone printing in sstabledump (CASSANDRA-11655)
 + * Fix paging for range queries where all clustering columns are specified (CASSANDRA-11669)
 + * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
 + * Ignore all LocalStrategy keyspaces for streaming and other related
 +   operations (CASSANDRA-11627)
 + * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)
 + * Only open one sstable scanner per sstable (CASSANDRA-11412)
 + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
 + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
 + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk
consistency (CASSANDRA-11470)
 + * Notify indexers of expired rows during compaction (CASSANDRA-11329)
 + * Properly respond with ProtocolError when a v1/v2 native protocol
 +   header is received (CASSANDRA-11464)
 + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
 +Merged from 2.2:
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
   * Exit JVM if JMX server fails to startup (CASSANDRA-11540)
   * Produce a heap dump when exiting on OOM (CASSANDRA-9861)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed84bbcb/src/java/org/apache/cassandra/dht/BootStrapper.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/dht/BootStrapper.java
index c44bad7,26fa6b3..1c40482
--- a/src/java/org/apache/cassandra/dht/BootStrapper.java
+++ b/src/java/org/apache/cassandra/dht/BootStrapper.java
@@@ -75,8 -75,9 +75,9 @@@ public class BootStrapper extends Progr
                                                     DatabaseDescriptor.getEndpointSnitch(),
                                                     stateStore);
          streamer.addSourceFilter(new RangeStreamer.FailureDetectorSourceFilter(FailureDetector.instance));
+         streamer.addSourceFilter(new RangeStreamer.ExcludeLocalNodeFilter());
  
 -        for (String keyspaceName : Schema.instance.getNonSystemKeyspaces())
 +        for (String keyspaceName : Schema.instance.getNonLocalStrategyKeyspaces())
          {
              AbstractReplicationStrategy strategy = Keyspace.open(keyspaceName).getReplicationStrategy();
              streamer.addRanges(keyspaceName, strategy.getPendingAddressRanges(tokenMetadata,
tokens, address));

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed84bbcb/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed84bbcb/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message