diff options
Diffstat (limited to 'container-search/src')
-rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java | 9 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java | 27 |
2 files changed, 0 insertions, 36 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java index 71f6b5bb87b..1f621eb926c 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java @@ -124,15 +124,6 @@ public class ClusterSearcher extends Searcher { return null; } - /** - * Returns false if this host is local. - */ - boolean isRemote(String host) throws UnknownHostException { - return (InetAddress.getByName(host).isLoopbackAddress()) - ? false - : !host.equals(HostName.getLocalhost()); - } - private static ClusterParams makeClusterParams(int searchclusterIndex) { return new ClusterParams("sc" + searchclusterIndex + ".num" + 0); } diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java index c772300876b..f35d77de01a 100644 --- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java @@ -21,12 +21,9 @@ import com.yahoo.search.Result; import com.yahoo.search.config.ClusterConfig; import com.yahoo.search.result.Hit; import com.yahoo.search.searchchain.Execution; -import com.yahoo.statistics.Statistics; import com.yahoo.vespa.config.search.DispatchConfig; import org.junit.Test; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -420,26 +417,6 @@ public class ClusterSearcherTestCase { } @Test - public void testLocalConnect() throws UnknownHostException { - ClusterSearcher cluster = new ClusterSearcher(new LinkedHashSet<>(Arrays.asList("dummy"))); - boolean canFindYahoo; - final String yahoo = "www.yahoo.com"; - - try { - canFindYahoo = (null != InetAddress.getByName(yahoo)); - } catch (Exception e) { - canFindYahoo = false; - } - - assertFalse(cluster.isRemote("127.0.0.1")); - assertFalse(cluster.isRemote("localhost")); - - if (canFindYahoo) { - assertTrue(cluster.isRemote(yahoo)); - } - } - - @Test public void testRequireThatSearchFailsForUndefinedRankProfileWithOneDocType() { Execution execution = createExecution(Arrays.asList("type1"), false); @@ -525,10 +502,6 @@ public class ClusterSearcherTestCase { searchClusterConfig.searchdef("streaming_sd"); } qrSearchersConfig.searchcluster(searchClusterConfig); - QrSearchersConfig.Searchcluster.Dispatcher.Builder dispatcherConfig = new QrSearchersConfig.Searchcluster.Dispatcher.Builder(); - dispatcherConfig.host("localhost"); - dispatcherConfig.port(0); - searchClusterConfig.dispatcher(dispatcherConfig); ClusterConfig.Builder clusterConfig = new ClusterConfig.Builder().clusterName(clusterName); if (maxQueryTimeout != null) |