diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-08-16 10:49:40 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-08-16 10:49:40 +0200 |
commit | e5312c400cb8de725a4cf233808ee2f9f9a79798 (patch) | |
tree | e296aa664accc95ab08780ae484d11ef22d15553 /config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java | |
parent | e536003faa53fd4df212010357d2327946122c14 (diff) |
Stop sending hints about files that should be downloaded when doing prepare
This is just an optimzation and is not today in hosted Vespa, since
authorization will not allow access to any new files until application
is activated anyway
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java index 963d2dde7fc..2bb8b6c9d1d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminBuilderBase.java @@ -68,11 +68,11 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu } @Override - protected Admin doBuild(DeployState deployState, AbstractConfigProducer parent, Element adminElement) { + protected Admin doBuild(DeployState deployState, AbstractConfigProducer<?> parent, Element adminElement) { Monitoring monitoring = getMonitoring(XML.getChild(adminElement,"monitoring"), deployState.isHosted()); Metrics metrics = new MetricsBuilder(applicationType, PredefinedMetricSets.get()) .buildMetrics(XML.getChild(adminElement, "metrics")); - FileDistributionConfigProducer fileDistributionConfigProducer = getFileDistributionConfigProducer(parent, deployState.isHosted()); + FileDistributionConfigProducer fileDistributionConfigProducer = getFileDistributionConfigProducer(parent); Admin admin = new Admin(parent, monitoring, metrics, multitenant, fileDistributionConfigProducer, deployState.isHosted()); admin.setApplicationType(applicationType); @@ -82,8 +82,8 @@ public abstract class DomAdminBuilderBase extends VespaDomBuilder.DomConfigProdu return admin; } - private FileDistributionConfigProducer getFileDistributionConfigProducer(AbstractConfigProducer parent, boolean isHosted) { - return new FileDistributionConfigProducer(parent, fileRegistry, configServerSpecs, isHosted); + private FileDistributionConfigProducer getFileDistributionConfigProducer(AbstractConfigProducer<?> parent) { + return new FileDistributionConfigProducer(parent, fileRegistry); } protected abstract void doBuildAdmin(DeployState deployState, Admin admin, Element adminE); |