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/8f985852 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f985852 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f985852 Branch: refs/heads/trunk Commit: 8f985852f11c9501137c150b0f25cfd0c17d3db8 Parents: 1492be0 5a2d529 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Nov 4 14:05:00 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 4 14:05:00 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f985852/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 61cc92e,60bf565..eb575e8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,29 -1,12 +1,30 @@@ -2.2.4 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581) +3.0 + * Guard batchlog replay against integer division by zero (CASSANDRA-9223) + * Fix bug when adding a column to thrift with the same name than a primary key (CASSANDRA-10608) + * Add client address argument to IAuthenticator::newSaslNegotiator (CASSANDRA-8068) + * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602) + * Don't use 'names query' read path for counters (CASSANDRA-10572) + * Fix backward compatibility for counters (CASSANDRA-10470) + * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581) + * Execute the metadata reload task of all registered indexes on CFS::reload (CASSANDRA-10604) + * Fix thrift cas operations with defined columns (CASSANDRA-10576) + * Fix PartitionUpdate.operationCount()for updates with static column operations (CASSANDRA-10606) + * Fix thrift get() queries with defined columns (CASSANDRA-10586) + * Fix marking of indexes as built and removed (CASSANDRA-10601) + * Skip initialization of non-registered 2i instances, remove Index::getIndexName (CASSANDRA-10595) + * Fix batches on multiple tables (CASSANDRA-10554) + * Ensure compaction options are validated when updating KeyspaceMetadata (CASSANDRA-10569) + * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975) + * Remove token generator (CASSANDRA-5261) + * RolesCache should not be created for any authenticator that does not requireAuthentication (CASSANDRA-10562) + * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421) + * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360) + * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367) +Merged from 2.2: * Expose phi values from failure detector via JMX and tweak debug and trace logging (CASSANDRA-9526) - * Fix RangeNamesQueryPager (CASSANDRA-10509) - * Deprecate Pig support (CASSANDRA-10542) - * Reduce contention getting instances of CompositeType (CASSANDRA-10433) Merged from 2.1: + * Improve handling of dead nodes in gossip (CASSANDRA-10298) * Fix logback-tools.xml incorrectly configured for outputing to System.err (CASSANDRA-9937) * Fix streaming to catch exception so retry not fail (CASSANDRA-10557) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f985852/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index fb1edf6,45ed493..75c2fd9 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -2159,13 -2144,12 +2159,14 @@@ public class StorageService extends Not private void excise(Collection<Token> tokens, InetAddress endpoint) { logger.info("Removing tokens {} for {}", tokens, endpoint); - HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint); + + if (tokenMetadata.isMember(endpoint)) + HintsService.instance.excise(tokenMetadata.getHostId(endpoint)); + removeEndpoint(endpoint); tokenMetadata.removeEndpoint(endpoint); - tokenMetadata.removeBootstrapTokens(tokens); + if (tokens != null) + tokenMetadata.removeBootstrapTokens(tokens); - notifyLeft(endpoint); PendingRangeCalculatorService.instance.update(); }
