You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/09/12 21:43:21 UTC
[1/6] git commit: Fix yaml snitch reconnect trick
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 <br...@apache.org>
Authored: Fri Sep 12 14:42:04 2014 -0500
Committer: Brandon Williams <br...@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()));
}
}
[2/6] git commit: Fix yaml snitch reconnect trick
Posted by br...@apache.org.
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.1
Commit: cb1479235b10c41b7665237d92f8cfd16ba5bfe8
Parents: 6c6c723
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 14:42:04 2014 -0500
Committer: Brandon Williams <br...@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()));
}
}
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
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/ddb1e168
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddb1e168
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddb1e168
Branch: refs/heads/trunk
Commit: ddb1e168b16a73d411faa2a79b826ebfbfe51fc8
Parents: 23b957c cb14792
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 14:43:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 12 14:43:04 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
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/ddb1e168
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddb1e168
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ddb1e168
Branch: refs/heads/cassandra-2.1
Commit: ddb1e168b16a73d411faa2a79b826ebfbfe51fc8
Parents: 23b957c cb14792
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 14:43:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 12 14:43:04 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: Fix yaml snitch reconnect trick
Posted by br...@apache.org.
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/trunk
Commit: cb1479235b10c41b7665237d92f8cfd16ba5bfe8
Parents: 6c6c723
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 14:42:04 2014 -0500
Committer: Brandon Williams <br...@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()));
}
}
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
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/a002a0ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a002a0ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a002a0ed
Branch: refs/heads/trunk
Commit: a002a0ed26771a3c80db2d7bae64fbf9e3aa1f12
Parents: 7b495e2 ddb1e16
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 14:43:14 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 12 14:43:14 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/locator/YamlFileNetworkTopologySnitch.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------