This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
     new 0b7e3a8ee7 Connect to listen address when own broadcast address is 
requested
0b7e3a8ee7 is described below

commit 0b7e3a8ee7f9359eaf63208e12f32b19e6874e74
Author: Maciej Sokol <maciej.so...@ericsson.com>
AuthorDate: Fri Jan 27 10:04:43 2023 -0600

    Connect to listen address when own broadcast address is requested
    
    Patch by Maciej Sokol; reviewed by brandonwilliams and smiklosovic for
    CASSANDRA-18200
---
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/net/OutboundConnectionSettings.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index b486d00ef2..806284588b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0.8
+ * Connect to listen address when own broadcast address is requested 
(CASSANDRA-18200)
  * Add safeguard so cleanup fails when node has pending ranges 
(CASSANDRA-16418)
  * Fix legacy clustering serialization for paging with compact storage 
(CASSANDRA-17507)
  * Add support for python 3.11 (CASSANDRA-18088)
diff --git a/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java 
b/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java
index c3c7825b4a..92a1f52bc3 100644
--- a/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java
+++ b/src/java/org/apache/cassandra/net/OutboundConnectionSettings.java
@@ -453,6 +453,8 @@ public class OutboundConnectionSettings
         InetAddressAndPort connectTo = this.connectTo;
         if (connectTo == null)
             connectTo = SystemKeyspace.getPreferredIP(to);
+        if (FBUtilities.getBroadcastAddressAndPort().equals(connectTo))
+            return FBUtilities.getLocalAddressAndPort();
         return connectTo;
     }
 


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

Reply via email to