cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 04 Nov 2015 14:05:52 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/5a2d5298
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a2d5298
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a2d5298

Branch: refs/heads/trunk
Commit: 5a2d5298423dc4501fad0d53183e7ac93d83e76c
Parents: b4b2684 b6015fa
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Nov 4 13:59:17 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Nov 4 13:59:17 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                          |  1 +
 .../apache/cassandra/db/HintedHandOffManager.java    |  4 ++++
 .../org/apache/cassandra/service/StorageService.java | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f25ac7e,5ceabb4..60bf565
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 -2.1.12
 +2.2.4
 + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581)
 + * 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/5a2d5298/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 179c611,4fbdd27..4ec5d62
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -213,10 -213,14 +213,14 @@@ public class HintedHandOffManager imple
      {
          if (!StorageService.instance.getTokenMetadata().isMember(endpoint))
              return;
+ 
          UUID hostId = StorageService.instance.getTokenMetadata().getHostId(endpoint);
+         if (hostId == null)
+             return;
+ 
          ByteBuffer hostIdBytes = ByteBuffer.wrap(UUIDGen.decompose(hostId));
 -        final Mutation mutation = new Mutation(Keyspace.SYSTEM_KS, hostIdBytes);
 -        mutation.delete(SystemKeyspace.HINTS_CF, System.currentTimeMillis());
 +        final Mutation mutation = new Mutation(SystemKeyspace.NAME, hostIdBytes);
 +        mutation.delete(SystemKeyspace.HINTS, System.currentTimeMillis());
  
          // execute asynchronously to avoid blocking caller (which may be processing gossip)
          Runnable runnable = new Runnable()

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a2d5298/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index f162f7c,d02a572..45ed493
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -2139,9 -1956,14 +2147,10 @@@ public class StorageService extends Not
          HintedHandOffManager.instance.deleteHintsForEndpoint(endpoint);
          removeEndpoint(endpoint);
          tokenMetadata.removeEndpoint(endpoint);
-         tokenMetadata.removeBootstrapTokens(tokens);
+         if (tokens != null)
+             tokenMetadata.removeBootstrapTokens(tokens);
  
 -        if (!isClientMode)
 -        {
 -            for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
 -                subscriber.onLeaveCluster(endpoint);
 -        }
 +        notifyLeft(endpoint);
          PendingRangeCalculatorService.instance.update();
      }
  


Mime
View raw message