Repository: cassandra Updated Branches: refs/heads/trunk 05d7661d0 -> 70d95359d
Bind to correct local address in 4.0 streaming patch by Lerh Chaun Low; reviewed by jasobrown for CASSANDRA-14362 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70d95359 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70d95359 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70d95359 Branch: refs/heads/trunk Commit: 70d95359d2dca1c35f573776d11ed87bb9b4b441 Parents: 05d7661 Author: Lerh Chuan Low <l...@instaclustr.com> Authored: Tue Apr 3 16:39:11 2018 +1000 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Apr 17 05:44:03 2018 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamSession.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/70d95359/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4c557b4..5e36674 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Bind to correct local address in 4.0 streaming (CASSANDRA-14362) * Use standard Amazon naming for datacenter and rack in Ec2Snitch (CASSANDRA-7839) * Fix junit failure for SSTableReaderTest (CASSANDRA-14387) * Abstract write path for pluggable storage (CASSANDRA-14118) http://git-wip-us.apache.org/repos/asf/cassandra/blob/70d95359/src/java/org/apache/cassandra/streaming/StreamSession.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java index adf5d76..42d1d97 100644 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@ -183,7 +183,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber this.connecting = connecting; this.index = index; - OutboundConnectionIdentifier id = OutboundConnectionIdentifier.stream(InetAddressAndPort.getByAddressOverrideDefaults(FBUtilities.getBroadcastAddressAndPort().address, 0), + OutboundConnectionIdentifier id = OutboundConnectionIdentifier.stream(InetAddressAndPort.getByAddressOverrideDefaults(FBUtilities.getJustLocalAddress(), 0), InetAddressAndPort.getByAddressOverrideDefaults(connecting.address, MessagingService.instance().portFor(connecting))); this.messageSender = new NettyStreamingMessageSender(this, id, factory, StreamMessage.CURRENT_VERSION, previewKind.isPreview()); this.metrics = StreamingMetrics.get(connecting); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
