diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-03-09 09:23:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-09 09:23:00 +0100 |
commit | 18a16836ba782dc6b28c585293f2e7ea522134af (patch) | |
tree | 99e189a19f3ca7988e6215165d9aa2a93da3021f /config-model | |
parent | 04abf11cba0fa0d49403c2c398219fac3ae80d7f (diff) |
Revert "Revert "Reapply "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; |