You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2018/07/20 22:20:15 UTC

cassandra git commit: Set broadcast address in internode messaging handshake

Repository: cassandra
Updated Branches:
  refs/heads/trunk 13150b001 -> c4263d26b


Set broadcast address in internode messaging handshake

patch by Ariel Weisberg; reviewed by jasobrown for CASSANDRA-14579


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

Branch: refs/heads/trunk
Commit: c4263d26b43a4a65a31f213a10f6fbd68217825c
Parents: 13150b0
Author: Ariel Weisberg <aw...@apple.com>
Authored: Fri Jul 20 14:27:12 2018 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Fri Jul 20 15:19:51 2018 -0700

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/net/MessagingService.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4263d26/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fe4087b..4b53c03 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0
+ * Set broadcast address in internode messaging handshake (CASSANDRA-14579)
  * Wait for schema agreement prior to building MVs (CASSANDRA-14571)
  * Make all DDL statements idempotent and not dependent on global state (CASSANDRA-13426)
  * Bump the hints messaging version to match the current one (CASSANDRA-14536)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4263d26/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index f5051fb..b2e72f4 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -1633,7 +1633,7 @@ public final class MessagingService implements MessagingServiceMBean
                 return null;
 
             InetAddressAndPort preferredRemote = SystemKeyspace.getPreferredIP(to);
-            InetAddressAndPort local = FBUtilities.getLocalAddressAndPort();
+            InetAddressAndPort local = FBUtilities.getBroadcastAddressAndPort();
             ServerEncryptionOptions encryptionOptions = secure ? DatabaseDescriptor.getInternodeMessagingEncyptionOptions() : null;
             IInternodeAuthenticator authenticator = DatabaseDescriptor.getInternodeAuthenticator();
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org