diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-03 23:11:47 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2018-10-03 23:11:47 +0200 |
commit | 3e52d3e21f97af574e8a7e20b50a99b0fb8a0b41 (patch) | |
tree | f3c93d03f18a5d132c1445a8d4dd87466826c18c /config-model | |
parent | 6520467f1afb87f0f97f87048a17ac1d4c5795da (diff) |
Needs deployState after VespaModel is constructed incomplete.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index a8e55e99e3b..dc7efefe24b 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -195,6 +195,8 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri else { // create a model with no services instantiated and the given file distributor this.allocatedHosts = AllocatedHosts.withHosts(hostSystem.getHostSpecs()); this.fileDistributor = fileDistributor; + this.deployState = deployState; + this.deployLogger = deployState.getDeployLogger(); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java index 570ab06f4fa..7802bd1eb65 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java @@ -12,6 +12,7 @@ import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.application.provider.IncludeDirs; import com.yahoo.config.model.builder.xml.ConfigModelBuilder; import com.yahoo.config.model.builder.xml.ConfigModelId; +import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.producer.AbstractConfigProducer; import com.yahoo.config.provision.AthenzService; import com.yahoo.config.provision.Capacity; @@ -23,7 +24,6 @@ import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.config.MetricDefaultsConfig; -import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.search.rendering.RendererRegistry; import com.yahoo.searchdefinition.derived.RankProfileList; import com.yahoo.text.XML; @@ -152,7 +152,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { return new ContainerCluster(ancestor, modelContext.getProducerId(), modelContext.getProducerId(), modelContext.getDeployState()); } - }.build(modelContext.getParentProducer(), spec); + }.build(modelContext.getDeployState(), modelContext.getParentProducer(), spec); } private void addClusterContent(ContainerCluster cluster, Element spec, ConfigModelContext context) { @@ -172,7 +172,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { addStatusHandlers(cluster, context); setDefaultMetricConsumerFactory(cluster); - addHttp(spec, cluster); + addHttp(context.getDeployState(), spec, cluster); addAccessLogs(cluster, spec); addRoutingAliases(cluster, spec, context.getDeployState().zone().environment()); @@ -330,15 +330,15 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } - protected void addHttp(Element spec, ContainerCluster cluster) { + protected final void addHttp(DeployState deployState, Element spec, ContainerCluster cluster) { Element httpElement = XML.getChild(spec, "http"); if (httpElement != null) { - cluster.setHttp(buildHttp(cluster, httpElement)); + cluster.setHttp(buildHttp(deployState, cluster, httpElement)); } } - private Http buildHttp(ContainerCluster cluster, Element httpElement) { - Http http = new HttpBuilder().build(cluster, httpElement); + private Http buildHttp(DeployState deployState, ContainerCluster cluster, Element httpElement) { + Http http = new HttpBuilder().build(deployState, cluster, httpElement); if (networking == Networking.disable) http.removeAllServers(); |