diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-08-12 16:59:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-12 16:59:09 +0200 |
commit | d23d8e91bb6a34c3327c32746c3466f241e18542 (patch) | |
tree | 9f2159a2b627054ee109ff25369510724f1cbc29 | |
parent | 8f72e05f6454f75da6130b94e6fc2912ce1cdd4b (diff) | |
parent | 4db3a83ef2573e19ef11eff86782026945b1d379 (diff) |
Merge pull request #10237 from vespa-engine/bjorncs/fix-fs4resourcepool-config
Move FS4ResourcePool component to ApplicationContainer
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java | 12 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java index 48f7fa3c1a2..d27812a80dd 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java @@ -4,6 +4,10 @@ package com.yahoo.vespa.model.container; import com.yahoo.config.model.api.TlsSecrets; import com.yahoo.config.model.api.container.ContainerServiceType; import com.yahoo.config.model.producer.AbstractConfigProducer; +import com.yahoo.container.bundle.BundleInstantiationSpecification; +import com.yahoo.osgi.provider.model.ComponentModel; +import com.yahoo.prelude.fastsearch.FS4ResourcePool; +import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.http.ConnectorFactory; import com.yahoo.vespa.model.container.http.Http; import com.yahoo.vespa.model.container.http.JettyHttpServer; @@ -39,8 +43,16 @@ public final class ApplicationContainer extends Container { server.addConnector(new ConnectorFactory(connectorName, 4443, new ConfiguredDirectSslProvider(server.getComponentId().getName(), tlsSecrets.get().key(), tlsSecrets.get().certificate(), null, null))); } + addComponent(getFS4ResourcePool()); // TODO Remove when FS4 based search protocol is gone } + private static Component<?, ComponentModel> getFS4ResourcePool() { + BundleInstantiationSpecification spec = BundleInstantiationSpecification. + getInternalSearcherSpecificationFromStrings(FS4ResourcePool.class.getName(), null); + return new Component<>(new ComponentModel(spec)); + } + + @Override protected ContainerServiceType myServiceType() { if (parent instanceof ContainerCluster) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java index d111c423ca1..6e78ccf8daa 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java @@ -2,16 +2,12 @@ package com.yahoo.vespa.model.container.search; import com.yahoo.container.QrSearchersConfig; -import com.yahoo.container.bundle.BundleInstantiationSpecification; -import com.yahoo.osgi.provider.model.ComponentModel; -import com.yahoo.prelude.fastsearch.FS4ResourcePool; import com.yahoo.prelude.semantics.SemanticRulesConfig; import com.yahoo.search.config.IndexInfoConfig; import com.yahoo.search.pagetemplates.PageTemplatesConfig; import com.yahoo.search.query.profile.config.QueryProfilesConfig; import com.yahoo.vespa.configdefinition.IlscriptsConfig; import com.yahoo.vespa.model.container.ApplicationContainerCluster; -import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.ContainerSubsystem; import com.yahoo.vespa.model.container.search.searchchain.LocalProvider; import com.yahoo.vespa.model.container.search.searchchain.SearchChains; @@ -50,17 +46,9 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> super(chains); this.options = options; - // TODO: Should be added to container instead of cluster to get proper configId for qr config. - cluster.addComponent(getFS4ResourcePool()); this.enableGroupingSessionCache = cluster.enableGroupingSessionCache(); } - private static Component<?, ComponentModel> getFS4ResourcePool() { - BundleInstantiationSpecification spec = BundleInstantiationSpecification. - getInternalSearcherSpecificationFromStrings(FS4ResourcePool.class.getName(), null); - return new Component<>(new ComponentModel(spec)); - } - public void connectSearchClusters(Map<String, AbstractSearchCluster> searchClusters) { systems.addAll(searchClusters.values()); initializeSearchChains(searchClusters); |