You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/07 07:35:13 UTC
git commit: remove duplicate queries for local tokens
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 c7e472e8c -> 0132e546b
remove duplicate queries for local tokens
patch by dbrosius reviewed by ayeschenko for cassandra-7182
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0132e546
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0132e546
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0132e546
Branch: refs/heads/cassandra-1.2
Commit: 0132e546b55b67f68fca230c9e0ca1ccef6aa273
Parents: c7e472e
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed May 7 01:34:02 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed May 7 01:34:02 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0132e546/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8c1d234..d7b7f00 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,7 @@
* fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
* Preserves CQL metadata when updating table from thrift (CASSANDRA-6831)
* fix time conversion to milliseconds in SimpleCondition.await (CASSANDRA-7149)
+ * remove duplicate query for local tokens (CASSANDRA-7182)
1.2.16
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0132e546/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 ed6d031..7cecec9 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -209,8 +209,9 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
SystemTable.updateTokens(tokens);
tokenMetadata.updateNormalTokens(tokens, FBUtilities.getBroadcastAddress());
// order is important here, the gossiper can fire in between adding these two states. It's ok to send TOKENS without STATUS, but *not* vice versa.
- Gossiper.instance.addLocalApplicationState(ApplicationState.TOKENS, valueFactory.tokens(getLocalTokens()));
- Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, valueFactory.normal(getLocalTokens()));
+ Collection<Token> localTokens = getLocalTokens();
+ Gossiper.instance.addLocalApplicationState(ApplicationState.TOKENS, valueFactory.tokens(localTokens));
+ Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, valueFactory.normal(localTokens));
setMode(Mode.NORMAL, false);
}