cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [03/19] cassandra git commit: Add check if existing fat client entry in gossip has same broadcast address in checkForEndpointCollision to enable quicker bootstrap retries.
Date Tue, 05 Jan 2016 17:03:02 GMT
Add check if existing fat client entry in gossip has same broadcast address in checkForEndpointCollision
to enable quicker bootstrap retries.

patch by jkni; reviewed by Stefania for CASSANDRA-10844


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b551b8e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b551b8e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b551b8e1

Branch: refs/heads/trunk
Commit: b551b8e1e6ac37698b78e4ee65a658bd446e7f05
Parents: a55fd76
Author: Joel Knighton <joel.knighton@datastax.com>
Authored: Thu Dec 31 10:27:25 2015 -0600
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Jan 5 15:31:17 2016 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b551b8e1/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 0698d11..6e38b92 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -550,7 +550,7 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
             for (Map.Entry<InetAddress, EndpointState> entry : Gossiper.instance.getEndpointStates())
             {
 
-                if (entry.getValue().getApplicationState(ApplicationState.STATUS) == null)
+                if (entry.getKey().equals(FBUtilities.getBroadcastAddress()) || entry.getValue().getApplicationState(ApplicationState.STATUS)
== null)
                         continue;
                 String[] pieces = entry.getValue().getApplicationState(ApplicationState.STATUS).value.split(VersionedValue.DELIMITER_STR,
-1);
                 assert (pieces.length > 0);


Mime
View raw message