diff options
author | Simon Willnauer <simon.willnauer@elasticsearch.com> | 2016-10-07 11:27:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-07 11:27:47 +0200 |
commit | 194a6b1df031a95977b6ca395a74a8b74d9af31d (patch) | |
tree | 70f549295eb66aea3c32e3368700ff9671e49029 /benchmarks/src/main/java | |
parent | eba60ee63c83be5bb306146ecd5c44e3e28c9b7b (diff) |
Remove LocalTransport in favor of MockTcpTransport (#20695)
This change proposes the removal of all non-tcp transport implementations. The
mock transport can be used by default to run tests instead of local transport that has
roughly the same performance compared to TCP or at least not noticeably slower.
This is a master only change, deprecation notice in 5.x will be committed as a
separate change.
Diffstat (limited to 'benchmarks/src/main/java')
-rw-r--r-- | benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/Allocators.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/Allocators.java b/benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/Allocators.java index 860137cf55..4d8f7cfeaa 100644 --- a/benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/Allocators.java +++ b/benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/Allocators.java @@ -31,15 +31,18 @@ import org.elasticsearch.cluster.routing.allocation.decider.AllocationDecider; import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.transport.LocalTransportAddress; +import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.util.set.Sets; import org.elasticsearch.gateway.GatewayAllocator; import java.lang.reflect.InvocationTargetException; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; public final class Allocators { private static class NoopGatewayAllocator extends GatewayAllocator { @@ -91,8 +94,11 @@ public final class Allocators { } + private static final AtomicInteger portGenerator = new AtomicInteger(); + public static DiscoveryNode newNode(String nodeId, Map<String, String> attributes) { - return new DiscoveryNode("", nodeId, LocalTransportAddress.buildUnique(), attributes, Sets.newHashSet(DiscoveryNode.Role.MASTER, + return new DiscoveryNode("", nodeId, new TransportAddress(TransportAddress.META_ADDRESS, + portGenerator.incrementAndGet()), attributes, Sets.newHashSet(DiscoveryNode.Role.MASTER, DiscoveryNode.Role.DATA), Version.CURRENT); } } |