cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 19 Dec 2014 00:40:26 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: 507b6c0294b43a6cd6ca5d3c2117b8d3ad42fab2
Parents: 3f55c35 81d5d6e
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Thu Dec 18 18:40:14 2014 -0600
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Thu Dec 18 18:40:14 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                               | 2 ++
 src/java/org/apache/cassandra/service/StorageService.java | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/507b6c02/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/507b6c02/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index a349e64,cc23712..4d176e6
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1601,11 -1650,15 +1602,11 @@@ public class StorageService extends Not
          if (!localTokensToRemove.isEmpty())
              SystemKeyspace.updateLocalTokens(Collections.<Token>emptyList(), localTokensToRemove);
  
-         if (tokenMetadata.isMoving(endpoint)) // if endpoint was moving to a new token
+         if (isMoving)
          {
              tokenMetadata.removeFromMoving(endpoint);
 -
 -            if (!isClientMode)
 -            {
 -                for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
 -                    subscriber.onMove(endpoint);
 -            }
 +            for (IEndpointLifecycleSubscriber subscriber : lifecycleSubscribers)
 +                subscriber.onMove(endpoint);
          }
          else
          {


Mime
View raw message