diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-03-04 15:13:33 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-04 15:13:33 +0100 |
commit | cf288e59fddb5a1a8ad2430a10f820068a61d120 (patch) | |
tree | 2a46b788a32283980d2b4bcc74a065300256ed1a /config-model | |
parent | cd29e2859009ca728dd6d268715d1703c8d4a321 (diff) | |
parent | 2d083718c16c1dd43a55338eab06e18f0d44ec85 (diff) |
Merge pull request #16795 from vespa-engine/jonmv/new-hosted-apps-use-dedicated-cluster-controllers
Jonmv/new hosted apps use dedicated cluster controllers
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java index 7c268a92d99..c909aeec022 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java @@ -303,13 +303,12 @@ public class ContentCluster extends AbstractConfigProducer implements clusterControllers = overlappingCluster.getClusterControllers(); } else if (admin.multitenant()) { - String clusterName = contentClusterName + "-controllers"; if (context.properties().dedicatedClusterControllerCluster()) clusterControllers = getDedicatedSharedControllers(contentElement, admin, context, deployState); else { clusterControllers = createClusterControllers(new ClusterControllerCluster(contentCluster, "standalone", deployState), drawControllerHosts(3, rootGroup), - clusterName, + contentClusterName + "-controllers", true, context.getDeployState()); contentCluster.clusterControllers = clusterControllers; |