You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/27 18:38:24 UTC
[2/6] git commit: Improve gossip performance for typical messages
patch by jbellis; tested by Quentin Conner for CASSANDRA-6409
Improve gossip performance for typical messages
patch by jbellis; tested by Quentin Conner for CASSANDRA-6409
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a16fa773
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a16fa773
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a16fa773
Branch: refs/heads/cassandra-2.0
Commit: a16fa77379d40c7b490f83bd9a07e2bf7d900c3b
Parents: 3f66fbf
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Nov 27 11:37:50 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Nov 27 11:37:50 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a16fa773/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8d443f9..0c7bb29 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@
* Improve initial FD phi estimate when starting up (CASSANDRA-6385)
* Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750)
* cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
+ * Improve gossip performance for typical messages (CASSANDRA-6409)
1.2.12
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a16fa773/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 250fa62..c9326ae 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1396,7 +1396,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
Set<Token> tokensToUpdateInSystemTable = new HashSet<Token>();
Set<Token> localTokensToRemove = new HashSet<Token>();
Set<InetAddress> endpointsToRemove = new HashSet<InetAddress>();
- Multimap<InetAddress, Token> epToTokenCopy = getTokenMetadata().getEndpointToTokenMapForReading();
for (final Token token : tokens)
{
@@ -1450,6 +1449,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// currentOwner is no longer current, endpoint is. Keep track of these moves, because when
// a host no longer has any tokens, we'll want to remove it.
+ Multimap<InetAddress, Token> epToTokenCopy = getTokenMetadata().getEndpointToTokenMapForReading();
epToTokenCopy.get(currentOwner).remove(token);
if (epToTokenCopy.get(currentOwner).size() < 1)
endpointsToRemove.add(currentOwner);