summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-07-02 09:59:22 +0200
committerJon Marius Venstad <venstad@gmail.com>2021-07-02 09:59:22 +0200
commit8013827a4e69e2a18467336f1ffb86e6d2748e4f (patch)
tree4b6806075c19e38237a429af8c5560a738c60ce7 /config-model
parent7fdb9e331df75667daf8e8f68a106af685cc02b7 (diff)
Always set up SessionCache in ApplicationContainerCluster
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java2
-rwxr-xr-xconfig-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java1
2 files changed, 2 insertions, 1 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 317ed0f66c7..fde3e3f012e 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
@@ -111,6 +111,8 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
addSimpleComponent("com.yahoo.container.jdisc.AthenzIdentityProviderProvider");
addSimpleComponent("com.yahoo.container.jdisc.SystemInfoProvider");
addSimpleComponent(com.yahoo.container.core.documentapi.DocumentAccessProvider.class.getName());
+ addSimpleComponent("com.yahoo.container.jdisc.messagebus.SessionCache");
+
addMetricsHandlers();
addTestrunnerComponentsIfTester(deployState);
}
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 1aab21bba35..d130b08d083 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -358,7 +358,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
public void setDocproc(ContainerDocproc containerDocproc) {
this.containerDocproc = containerDocproc;
- addSimpleComponent("com.yahoo.container.jdisc.messagebus.SessionCache");
}
public ContainerDocumentApi getDocumentApi() {