Skip to content

Lazy resolve unicast hosts #21630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Nov 22, 2016
Merged

Lazy resolve unicast hosts #21630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7fd9e24
Lazy resolve unicast hosts
jasontedor Nov 16, 2016
cc7d53e
Add timeout for concurrent DNS resolutions
jasontedor Nov 17, 2016
2456768
Cleanup setup of test resources for UnicastZenPing
jasontedor Nov 18, 2016
0493ba7
Do not swallow interrupted exception
jasontedor Nov 18, 2016
f6203d7
Add resolve timeout to log message
jasontedor Nov 18, 2016
4868321
Fix comment in UnicastZenPing
jasontedor Nov 18, 2016
37c73aa
Merge branch 'master' into lazy-resolve
jasontedor Nov 21, 2016
a28dc6e
Refactor host resolution to use executor service
jasontedor Nov 18, 2016
e2fc5a2
Simplify handling of hostname lookups in UZP
jasontedor Nov 22, 2016
62f2cc7
Set default resolve timeout to five seconds
jasontedor Nov 22, 2016
156a49b
Add Javadocs for UnicastZenPing#ping
jasontedor Nov 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ public void apply(Settings value, Settings current, Settings previous) {
ZenDiscovery.MASTER_ELECTION_IGNORE_NON_MASTER_PINGS_SETTING,
UnicastZenPing.DISCOVERY_ZEN_PING_UNICAST_HOSTS_SETTING,
UnicastZenPing.DISCOVERY_ZEN_PING_UNICAST_CONCURRENT_CONNECTS_SETTING,
UnicastZenPing.DISCOVERY_ZEN_PING_UNICAST_HOSTS_RESOLVE_TIMEOUT,
SearchService.DEFAULT_KEEPALIVE_SETTING,
SearchService.KEEPALIVE_INTERVAL_SETTING,
SearchService.LOW_LEVEL_CANCELLATION_SETTING,
Expand Down
172 changes: 130 additions & 42 deletions core/src/main/java/org/elasticsearch/discovery/zen/UnicastZenPing.java
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions core/src/main/java/org/elasticsearch/transport/TcpTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import com.carrotsearch.hppc.IntHashSet;
import com.carrotsearch.hppc.IntSet;

import org.apache.logging.log4j.message.ParameterizedMessage;
import org.apache.logging.log4j.util.Supplier;
import org.apache.lucene.util.IOUtils;
Expand Down Expand Up @@ -715,7 +714,7 @@ public static int resolvePublishPort(String profileName, Settings settings, Sett
}

@Override
public TransportAddress[] addressesFromString(String address, int perAddressLimit) throws Exception {
public TransportAddress[] addressesFromString(String address, int perAddressLimit) throws UnknownHostException {
Copy link
Contributor

@bleskes bleskes Nov 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

return parse(address, settings.get("transport.profiles.default.port", TransportSettings.PORT.get(settings)), perAddressLimit);
}

Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/elasticsearch/transport/Transport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.elasticsearch.common.transport.TransportAddress;

import java.io.IOException;
import java.net.UnknownHostException;
import java.util.List;
import java.util.Map;

Expand All @@ -53,7 +54,7 @@ public interface Transport extends LifecycleComponent {
/**
* Returns an address from its string representation.
*/
TransportAddress[] addressesFromString(String address, int perAddressLimit) throws Exception;
TransportAddress[] addressesFromString(String address, int perAddressLimit) throws UnknownHostException;

/**
* Is the address type supported.
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/elasticsearch/transport/TransportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import org.elasticsearch.threadpool.ThreadPool;

import java.io.IOException;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
Expand Down Expand Up @@ -617,7 +618,7 @@ private long newRequestId() {
return requestIds.getAndIncrement();
}

public TransportAddress[] addressesFromString(String address, int perAddressLimit) throws Exception {
public TransportAddress[] addressesFromString(String address, int perAddressLimit) throws UnknownHostException {
return transport.addressesFromString(address, perAddressLimit);
}

Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/elasticsearch/client/transport/FailAndRetryMockTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.elasticsearch.transport.TransportServiceAdapter;

import java.io.IOException;
import java.net.UnknownHostException;
import java.util.Collections;
import java.util.Map;
import java.util.Random;
Expand Down Expand Up @@ -133,7 +134,7 @@ public BoundTransportAddress boundAddress() {
}

@Override
public TransportAddress[] addressesFromString(String address, int perAddressLimit) throws Exception {
public TransportAddress[] addressesFromString(String address, int perAddressLimit) throws UnknownHostException {
throw new UnsupportedOperationException();
}

Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/elasticsearch/cluster/NodeConnectionsServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.junit.Before;

import java.io.IOException;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -188,7 +189,7 @@ public Map<String, BoundTransportAddress> profileBoundAddresses() {
}

@Override
public TransportAddress[] addressesFromString(String address, int perAddressLimit) throws Exception {
public TransportAddress[] addressesFromString(String address, int perAddressLimit) throws UnknownHostException {
return new TransportAddress[0];
}

Expand Down
Loading