Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f57aa05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f57aa05 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f57aa05 Branch: refs/heads/cassandra-2.1 Commit: 4f57aa0563f76467f5d94b460fc73e805327bde3 Parents: 60faac4 0a09edc Author: Brandon Williams <[email protected]> Authored: Tue May 6 16:13:09 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue May 6 16:13:09 2014 -0500 ---------------------------------------------------------------------- .../cassandra/service/StorageService.java | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f57aa05/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index f1be0c2,0300f55..13d9fda --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -1529,11 -1550,12 +1558,12 @@@ public class StorageService extends Not if (logger.isDebugEnabled()) - logger.debug("Node " + endpoint + " state normal, token " + tokens); + logger.debug("Node {} state normal, token {}", endpoint, tokens); if (tokenMetadata.isMember(endpoint)) - logger.info("Node " + endpoint + " state jump to normal"); + logger.info("Node {} state jump to normal", endpoint); + updatePeerInfo(endpoint); // Order Matters, TM.updateHostID() should be called before TM.updateNormalToken(), (see CASSANDRA-4300). if (Gossiper.instance.usesHostId(endpoint)) {
