cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.X
Date Tue, 04 Oct 2016 13:37:56 GMT
Merge branch 'cassandra-3.0' into cassandra-3.X


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

Branch: refs/heads/trunk
Commit: af60ca9b75c916f62cf95a79c4e0202b07b91a77
Parents: 0ac1079 85ac06c
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Oct 4 14:37:25 2016 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Oct 4 14:37:25 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../apache/cassandra/dht/tokenallocator/TokenAllocation.java   | 6 +++---
 test/unit/org/apache/cassandra/dht/BootStrapperTest.java       | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af60ca9b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 20bb4ff,d38bf3e..0c1fd76
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,78 -1,5 +1,79 @@@
 -3.0.10
 +3.10
 + * Add hint delivery metrics (CASSANDRA-12693)
 + * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
 + * ColumnIndex does not reuse buffer (CASSANDRA-12502)
 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
 + * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
 + * Tune compaction thread count via nodetool (CASSANDRA-12248)
 + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
 + * Include repair session IDs in repair start message (CASSANDRA-12532)
 + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
 + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
 + * Support optional backpressure strategies at the coordinator (CASSANDRA-9318)
 + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
 + * Fix cassandra-stress graphing (CASSANDRA-12237)
 + * Allow filtering on partition key columns for queries without secondary indexes (CASSANDRA-11031)
 + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
 + * Add JMH benchmarks.jar (CASSANDRA-12586)
 + * Add row offset support to SASI (CASSANDRA-11990)
 + * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
 + * Add keep-alive to streaming (CASSANDRA-11841)
 + * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
 + * avoid deleting non existing sstable files and improve related log messages (CASSANDRA-12261)
 + * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
 + * Retry all internode messages once after a connection is
 +   closed and reopened (CASSANDRA-12192)
 + * Add support to rebuild from targeted replica (CASSANDRA-9875)
 + * Add sequence distribution type to cassandra stress (CASSANDRA-12490)
 + * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154)
 + * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474)
 + * Extend read/write failure messages with a map of replica addresses
 +   to error codes in the v5 native protocol (CASSANDRA-12311)
 + * Fix rebuild of SASI indexes with existing index files (CASSANDRA-12374)
 + * Let DatabaseDescriptor not implicitly startup services (CASSANDRA-9054, 12550)
 + * Fix clustering indexes in presence of static columns in SASI (CASSANDRA-12378)
 + * Fix queries on columns with reversed type on SASI indexes (CASSANDRA-12223)
 + * Added slow query log (CASSANDRA-12403)
 + * Count full coordinated request against timeout (CASSANDRA-12256)
 + * Allow TTL with null value on insert and update (CASSANDRA-12216)
 + * Make decommission operation resumable (CASSANDRA-12008)
 + * Add support to one-way targeted repair (CASSANDRA-9876)
 + * Remove clientutil jar (CASSANDRA-11635)
 + * Fix compaction throughput throttle (CASSANDRA-12366, CASSANDRA-12717)
 + * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358)
 + * Cassandra stress should dump all setting on startup (CASSANDRA-11914)
 + * Make it possible to compact a given token range (CASSANDRA-10643)
 + * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179)
 + * Collect metrics on queries by consistency level (CASSANDRA-7384)
 + * Add support for GROUP BY to SELECT statement (CASSANDRA-10707)
 + * Deprecate memtable_cleanup_threshold and update default for memtable_flush_writers (CASSANDRA-12228)
 + * Upgrade to OHC 0.4.4 (CASSANDRA-12133)
 + * Add version command to cassandra-stress (CASSANDRA-12258)
 + * Create compaction-stress tool (CASSANDRA-11844)
 + * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
 + * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
 + * Support filtering on non-PRIMARY KEY columns in the CREATE
 +   MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
 + * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
 + * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
 + * Faster write path (CASSANDRA-12269)
 + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
 + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
 + * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635)
 + * Prepend snapshot name with "truncated" or "dropped" when a snapshot
 +   is taken before truncating or dropping a table (CASSANDRA-12178)
 + * Optimize RestrictionSet (CASSANDRA-12153)
 + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
 + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
 + * Create a system table to expose prepared statements (CASSANDRA-8831)
 + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
 + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
 + * Add supplied username to authentication error messages (CASSANDRA-12076)
 + * Remove pre-startup check for open JMX port (CASSANDRA-12074)
 + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
 + * Restore resumable hints delivery (CASSANDRA-11960)
 +Merged from 3.0:
+  * Fix exceptions with new vnode allocation (CASSANDRA-12715)
   * Unify drain and shutdown processes (CASSANDRA-12509)
   * Fix NPE in ComponentOfSlice.isEQ() (CASSANDRA-12706)
   * Fix failure in LogTransactionTest (CASSANDRA-12632)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/af60ca9b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java
index 7658ea0,971a120..ebbd690
--- a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java
+++ b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java
@@@ -58,12 -59,11 +59,11 @@@ public class TokenAllocatio
          if (logger.isWarnEnabled())
          {
              logger.warn("Selected tokens {}", tokens);
-             SummaryStatistics os = replicatedOwnershipStats(tokenMetadata, rs, endpoint);
-             TokenMetadata tokenMetadataCopy = tokenMetadata.cloneOnlyTokenMap();
+             SummaryStatistics os = replicatedOwnershipStats(tokenMetadataCopy, rs, endpoint);
              tokenMetadataCopy.updateNormalTokens(tokens, endpoint);
              SummaryStatistics ns = replicatedOwnershipStats(tokenMetadataCopy, rs, endpoint);
 -            logger.warn("Replicated node load in datacentre before allocation " + statToString(os));
 -            logger.warn("Replicated node load in datacentre after allocation " + statToString(ns));
 +            logger.warn("Replicated node load in datacentre before allocation {}", statToString(os));
 +            logger.warn("Replicated node load in datacentre after allocation {}", statToString(ns));
  
              // TODO: Is it worth doing the replicated ownership calculation always to be
able to raise this alarm?
              if (ns.getStandardDeviation() > os.getStandardDeviation())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/af60ca9b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
----------------------------------------------------------------------


Mime
View raw message