Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 c4f1f4080 -> 3d48cbc74 refs/heads/cassandra-3.11 f8acbd278 -> 4f4c390bc refs/heads/trunk 45c3b461e -> fcb87a2d1
sstableloader should use discovered broadcast address to connect intra-cluster Patch by Jeremy Ow; Reviewed by Ariel Weisberg Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d48cbc7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d48cbc7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d48cbc7 Branch: refs/heads/cassandra-3.0 Commit: 3d48cbc74cb50e02e85ed51ccf6a3a46690c3a99 Parents: c4f1f408 Author: Jeremy Ow <arbitraryemai...@gmx.com> Authored: Thu Aug 2 12:14:18 2018 -0400 Committer: Ariel Weisberg <aweisb...@apple.com> Committed: Mon Aug 6 12:04:54 2018 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d48cbc7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e4dbbda..7e4d88c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.18 + * sstableloader should use discovered broadcast address to connect intra-cluster (CASSANDRA-14522) * Fix reading columns with non-UTF names from schema (CASSANDRA-14468) Merged from 2.2: * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d48cbc7/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java index 3e0d97b..1d65aa0 100644 --- a/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java +++ b/src/java/org/apache/cassandra/utils/NativeSSTableLoaderClient.java @@ -85,7 +85,7 @@ public class NativeSSTableLoaderClient extends SSTableLoader.Client Range<Token> range = new Range<>(tokenFactory.fromString(tokenRange.getStart().getValue().toString()), tokenFactory.fromString(tokenRange.getEnd().getValue().toString())); for (Host endpoint : endpoints) - addRangeForEndpoint(range, endpoint.getAddress()); + addRangeForEndpoint(range, endpoint.getBroadcastAddress()); } Types types = fetchTypes(keyspace, session); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
