Merge remote-tracking branch 'origin/master' into ogronnesby/propagate-ca-in-config

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 f00b617de46..82f0c87d074 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;
@@ -48,8 +52,16 @@ public final class ApplicationContainer extends Container {
 
             server.addConnector(new ConnectorFactory(connectorName, 4443, sslProvider));
         }
+        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);