diff options
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java | 26 | ||||
-rw-r--r-- | container-search/src/main/resources/configdefinitions/search-nodes.def | 5 |
2 files changed, 5 insertions, 26 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java index aa820d1d898..25a4197dcac 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/searchchain/LocalProvider.java @@ -7,7 +7,6 @@ import com.yahoo.component.chain.model.ChainSpecification; import com.yahoo.component.chain.model.ChainedComponentModel; import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig; import com.yahoo.prelude.cluster.QrMonitorConfig; -import com.yahoo.search.config.dispatchprototype.SearchNodesConfig; import com.yahoo.vespa.config.search.DispatchConfig; import com.yahoo.vespa.config.search.RankProfilesConfig; import com.yahoo.vespa.config.search.AttributesConfig; @@ -16,9 +15,11 @@ import com.yahoo.search.searchchain.model.federation.FederationOptions; import com.yahoo.search.searchchain.model.federation.LocalProviderSpec; import com.yahoo.vespa.model.search.AbstractSearchCluster; import com.yahoo.vespa.model.search.IndexedSearchCluster; -import com.yahoo.vespa.model.search.SearchNode; -import java.util.*; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; /** * Config producer for search chain responsible for sending queries to a local cluster. @@ -31,7 +32,6 @@ public class LocalProvider extends Provider implements AttributesConfig.Producer, QrMonitorConfig.Producer, RankProfilesConfig.Producer, - SearchNodesConfig.Producer, DispatchConfig.Producer { private final LocalProviderSpec providerSpec; @@ -69,22 +69,6 @@ public class LocalProvider extends Provider implements } } - @Override - public void getConfig(final SearchNodesConfig.Builder builder) { - if (!(searchCluster instanceof IndexedSearchCluster)) { - log.warning("Could not build SearchNodesConfig: Only supported for IndexedSearchCluster, got " - + searchCluster.getClass().getCanonicalName()); - return; - } - final IndexedSearchCluster indexedSearchCluster = (IndexedSearchCluster) searchCluster; - for (final SearchNode searchNode : indexedSearchCluster.getSearchNodes()) { - builder.search_node( - new SearchNodesConfig.Search_node.Builder() - .host(searchNode.getHostName()) - .port(searchNode.getDispatchPort())); - } - } - private void addProviderSearchers() { for (ChainedComponentModel searcherModel : LocalProviderSpec.searcherModels) { addInnerComponent(new Searcher<>(searcherModel)); @@ -121,7 +105,7 @@ public class LocalProvider extends Provider implements return providerSpec.clusterName; } - public void setSearchCluster(AbstractSearchCluster searchCluster) { + void setSearchCluster(AbstractSearchCluster searchCluster) { assert (this.searchCluster == null); this.searchCluster = searchCluster; } diff --git a/container-search/src/main/resources/configdefinitions/search-nodes.def b/container-search/src/main/resources/configdefinitions/search-nodes.def deleted file mode 100644 index 84e0aa719d8..00000000000 --- a/container-search/src/main/resources/configdefinitions/search-nodes.def +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -namespace=search.config.dispatchprototype - -search_node[].host string -search_node[].port int |