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/d55a51e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d55a51e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d55a51e9 Branch: refs/heads/trunk Commit: d55a51e9523d3695fa43bfbe7da3b6ab0a110caf Parents: 65885e7 94c361d Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Dec 11 17:58:48 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Dec 11 17:58:48 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 7 +++++++ conf/cassandra.yaml | 8 ++++++++ .../org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java | 5 +++++ .../locator/ReconnectableSnitchHelper.java | 2 +- .../apache/cassandra/net/MessagingService.java | 20 ++++++++++++++++---- .../cassandra/service/StorageService.java | 8 ++++---- .../org/apache/cassandra/utils/FBUtilities.java | 16 ++++++++++++++++ .../apache/cassandra/service/RemoveTest.java | 2 +- 9 files changed, 59 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55a51e9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5932dbb,035e471..a71ecbd --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,37 -1,14 +1,44 @@@ -2.2.5 +3.0.2 ++Merged from 2.2 + * 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) Merged from 2.1: * Allow cancellation of index summary redistribution (CASSANDRA-8805) - * Fix Stress profile parsing on Windows (CASSANDRA-10808) + -2.2.4 +3.0.1 + * Avoid MV race during node decommission (CASSANDRA-10674) + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) + * Handle single-column deletions correction in materialized views + when the column is part of the view primary key (CASSANDRA-10796) + * Fix issue with datadir migration on upgrade (CASSANDRA-10788) + * Fix bug with range tombstones on reverse queries and test coverage for + AbstractBTreePartition (CASSANDRA-10059) + * Remove 64k limit on collection elements (CASSANDRA-10374) + * Remove unclear Indexer.indexes() method (CASSANDRA-10690) + * Fix NPE on stream read error (CASSANDRA-10771) + * Normalize cqlsh DESC output (CASSANDRA-10431) + * Rejects partition range deletions when columns are specified (CASSANDRA-10739) + * Fix error when saving cached key for old format sstable (CASSANDRA-10778) + * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758) + * Fix SELECT statement with IN restrictions on partition key, + ORDER BY and LIMIT (CASSANDRA-10729) + * Improve stress performance over 1k threads (CASSANDRA-7217) + * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731) + * Unable to create a function with argument of type Inet (CASSANDRA-10741) + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717) + * Correctly preserve deletion info on updated rows when notifying indexers + of single-row deletions (CASSANDRA-10694) + * Notify indexers of partition delete during cleanup (CASSANDRA-10685) + * Keep the file open in trySkipCache (CASSANDRA-10669) + * Updated trigger example (CASSANDRA-10257) +Merged from 2.2: + * Fix regression on split size in CqlInputFormat (CASSANDRA-10835) + * Better handling of SSL connection errors inter-node (CASSANDRA-10816) + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) + * Fix IllegalArgumentException in DataOutputBuffer.reallocate for large buffers (CASSANDRA-10592) * Show CQL help in cqlsh in web browser (CASSANDRA-7225) * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775) * Reject index queries while the index is building (CASSANDRA-8505) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55a51e9/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55a51e9/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55a51e9/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55a51e9/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55a51e9/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index b150f8c,e8e7daf..4e749dc --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -554,24 -573,9 +554,24 @@@ public class StorageService extends Not Gossiper.instance.start((int) (System.currentTimeMillis() / 1000)); // needed for node-ring gathering. Gossiper.instance.addLocalApplicationState(ApplicationState.NET_VERSION, valueFactory.networkVersion()); if (!MessagingService.instance().isListening()) - MessagingService.instance().listen(FBUtilities.getLocalAddress()); + MessagingService.instance().listen(); } + public void populateTokenMetadata() + { + if (Boolean.parseBoolean(System.getProperty("cassandra.load_ring_state", "true"))) + { + logger.info("Populating token metadata from system tables"); + Multimap<InetAddress, Token> loadedTokens = SystemKeyspace.loadTokens(); + if (!shouldBootstrap()) // if we have not completed bootstrapping, we should not add ourselves as a normal token + loadedTokens.putAll(FBUtilities.getBroadcastAddress(), SystemKeyspace.getSavedTokens()); + for (InetAddress ep : loadedTokens.keySet()) + tokenMetadata.updateNormalTokens(loadedTokens.get(ep), ep); + + logger.info("Token metadata: {}", tokenMetadata); + } + } + public synchronized void initServer() throws ConfigurationException { initServer(RING_DELAY); @@@ -792,10 -781,10 +792,10 @@@ Schema.instance.updateVersionAndAnnounce(); // Ensure we know our own actual Schema UUID in preparation for updates if (!MessagingService.instance().isListening()) - MessagingService.instance().listen(FBUtilities.getLocalAddress()); + MessagingService.instance().listen(); LoadBroadcaster.instance.startBroadcasting(); - HintedHandOffManager.instance.start(); + HintsService.instance.startDispatch(); BatchlogManager.instance.start(); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55a51e9/src/java/org/apache/cassandra/utils/FBUtilities.java ----------------------------------------------------------------------
