Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a55fd76dd -> b551b8e1e refs/heads/cassandra-2.2 e0c1b0bb7 -> 3a0be2540
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/cassandra-2.1 Commit: b551b8e1e6ac37698b78e4ee65a658bd446e7f05 Parents: a55fd76 Author: Joel Knighton <[email protected]> Authored: Thu Dec 31 10:27:25 2015 -0600 Committer: Sylvain Lebresne <[email protected]> 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);
