diff options
author | Arne H Juul <arnej@yahooinc.com> | 2022-01-18 13:26:56 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2022-01-18 13:26:56 +0000 |
commit | 74b4c0495907dee87491879455a81f748c29c236 (patch) | |
tree | 4ae45759aea8cbd92f2742db8fb2c6c02bbc713c /config-model/src | |
parent | d1f1b1a97766e0749f6a9429610941a75a409d0b (diff) |
add feature flag for old "qrserver" service name
* we will remove the hack that uses "qrserver" as the service name in
some cases, but we need to check what the impact will be first.
Diffstat (limited to 'config-model/src')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java | 4 |
1 files changed, 3 insertions, 1 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 7c386875d02..43cb896c09b 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 @@ -24,6 +24,7 @@ public final class ApplicationContainer extends Container implements private final boolean isHostedVespa; private final boolean enableServerOcspStapling; + private final boolean useQrserverServiceName; public ApplicationContainer(AbstractConfigProducer<?> parent, String name, int index, DeployState deployState) { this(parent, name, false, index, deployState); @@ -33,6 +34,7 @@ public final class ApplicationContainer extends Container implements super(parent, name, retired, index, deployState); this.isHostedVespa = deployState.isHosted(); this.enableServerOcspStapling = deployState.featureFlags().enableServerOcspStapling(); + this.useQrserverServiceName = deployState.featureFlags().useQrserverServiceName(); addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerHolder")); addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerProvider")); @@ -56,7 +58,7 @@ public final class ApplicationContainer extends Container implements if (parent instanceof ContainerCluster) { ContainerCluster<?> cluster = (ContainerCluster<?>)parent; // TODO: The 'qrserver' name is retained for legacy reasons (e.g. system tests and log parsing). - if (cluster.getSearch() != null && cluster.getDocproc() == null && cluster.getDocumentApi() == null) { + if (useQrserverServiceName && cluster.getSearch() != null && cluster.getDocproc() == null && cluster.getDocumentApi() == null) { return ContainerServiceType.QRSERVER; } } |