From c4263d26b43a4a65a31f213a10f6fbd68217825c Mon Sep 17 00:00:00 2001 From: Ariel Weisberg Date: Fri, 20 Jul 2018 14:27:12 -0700 Subject: [PATCH] Set broadcast address in internode messaging handshake patch by Ariel Weisberg; reviewed by jasobrown for CASSANDRA-14579 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/MessagingService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index fe4087bf7b..4b53c0342d 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) diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index f5051fbf57..b2e72f4406 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();