diff options
author | gjoranv <gv@verizonmedia.com> | 2022-03-06 20:27:11 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-03-06 20:27:11 +0100 |
commit | 8419cba0870998b45506d54039bece445ef7bef5 (patch) | |
tree | 3dbbb401a9f6b86eda27d01d60eb5be4545c240c | |
parent | 316461a4778011fc2fadd68270f33b34c83d99b6 (diff) |
Add a DocumentTypeManager component to all application containers.
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 8f95e390b07..fae12a63427 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -36,6 +36,7 @@ import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.Handler; import com.yahoo.vespa.model.container.component.SystemBindingPattern; import com.yahoo.vespa.model.container.configserver.ConfigserverCluster; +import com.yahoo.vespa.model.container.docproc.DocprocChains; import com.yahoo.vespa.model.utils.FileSender; import java.util.ArrayList; @@ -48,6 +49,7 @@ import java.util.Set; import java.util.stream.Collectors; import static com.yahoo.config.model.api.ApplicationClusterEndpoint.RoutingMethod.sharedLayer4; +import static com.yahoo.vespa.model.container.docproc.DocprocChains.DOCUMENT_TYPE_MANAGER_CLASS; /** * A container cluster that is typically set up from the user application. @@ -110,6 +112,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat addSimpleComponent("com.yahoo.container.jdisc.CertificateStoreProvider"); addSimpleComponent("com.yahoo.container.jdisc.AthenzIdentityProviderProvider"); addSimpleComponent(com.yahoo.container.core.documentapi.DocumentAccessProvider.class.getName()); + addSimpleComponent(DOCUMENT_TYPE_MANAGER_CLASS); addMetricsHandlers(); addTestrunnerComponentsIfTester(deployState); diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java index 56606210bb9..86f18094d31 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/docproc/DocprocChains.java @@ -21,11 +21,15 @@ public class DocprocChains extends Chains<DocprocChain> { private final ProcessingHandler<DocprocChains> docprocHandler; - public DocprocChains(AbstractConfigProducer parent, String subId) { + public DocprocChains(AbstractConfigProducer<?> parent, String subId) { super(parent, subId); docprocHandler = new ProcessingHandler<>(this, "com.yahoo.docproc.jdisc.DocumentProcessingHandler"); addComponent(docprocHandler); - addComponent(new SimpleComponent(DOCUMENT_TYPE_MANAGER_CLASS)); + + if (! (getParent() instanceof ApplicationContainerCluster)) { + // All application containers have a DocumentTypeManager, but this could also be e.g. a cluster controller + addComponent(new SimpleComponent(DOCUMENT_TYPE_MANAGER_CLASS)); + } } private void addComponent(Component<?, ?> component) { |