Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 6c6c723b9 -> cb1479235 refs/heads/cassandra-2.1 23b957c5a -> ddb1e168b refs/heads/trunk 7b495e250 -> a002a0ed2
Fix yaml snitch reconnect trick Patch by Holger Bornträger, reviewed by brandonwilliams for CASSANDRA-7912 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb147923 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb147923 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb147923 Branch: refs/heads/cassandra-2.0 Commit: cb1479235b10c41b7665237d92f8cfd16ba5bfe8 Parents: 6c6c723 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Sep 12 14:42:04 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Sep 12 14:42:04 2014 -0500 ---------------------------------------------------------------------- .../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb147923/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java index 99ab792..3237979 100644 --- a/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java +++ b/src/java/org/apache/cassandra/locator/YamlFileNetworkTopologySnitch.java @@ -367,11 +367,11 @@ public class YamlFileNetworkTopologySnitch if (es == null) return; final VersionedValue vv = es.getApplicationState(ApplicationState.INTERNAL_IP); - if ((vv != null && !vv.value.equals(localNodeData.dcLocalAddress.toString())) + if ((vv != null && !vv.value.equals(localNodeData.dcLocalAddress.getHostAddress())) || vv == null) { Gossiper.instance.addLocalApplicationState(ApplicationState.INTERNAL_IP, - StorageService.instance.valueFactory.internalIP(localNodeData.dcLocalAddress.toString())); + StorageService.instance.valueFactory.internalIP(localNodeData.dcLocalAddress.getHostAddress())); } }
