diff options
author | gjoranv <gv@verizonmedia.com> | 2022-01-10 14:17:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-10 14:17:24 +0100 |
commit | 82b4b0662519090c5bad8d95bca5f98ea07ae1b9 (patch) | |
tree | 3d425aa1f06786ef8716666f8e76c70c3a75222e /config-model | |
parent | 24e47f5e68aed5c983250dbfbe91d895acc3cb13 (diff) | |
parent | 4376003aaa692a2837068b9970e90da5d7ed5648 (diff) |
Merge pull request #20725 from vespa-engine/hmusum/gc-dead-code
GC 'filedistribution' in service.xml
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java index f80030a7e95..5aaba9550d2 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2Builder.java @@ -47,12 +47,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { if ( ! admin.multitenant()) admin.setClusterControllers(addConfiguredClusterControllers(deployState, admin, adminE), deployState); - ModelElement adminElement = new ModelElement(adminE); - addLogForwarders(adminElement.child("logforwarding"), admin); - - if (adminElement.child("filedistribution") != null) { - deployState.getDeployLogger().logApplicationPackage(Level.WARNING, "'filedistribution' element is deprecated and ignored"); - } + addLogForwarders(new ModelElement(adminE).child("logforwarding"), admin); } private List<Configserver> parseConfigservers(DeployState deployState, Admin admin, Element adminE) { @@ -158,7 +153,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { } @Override - protected Logserver doBuild(DeployState deployState, AbstractConfigProducer parent, Element producerSpec) { + protected Logserver doBuild(DeployState deployState, AbstractConfigProducer<?> parent, Element producerSpec) { return new Logserver(parent); } } @@ -177,7 +172,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { } @Override - protected Configserver doBuild(DeployState deployState, AbstractConfigProducer parent, Element spec) { + protected Configserver doBuild(DeployState deployState, AbstractConfigProducer<?> parent, Element spec) { var configServer = new Configserver(parent, "configserver." + i, rpcPort); configServer.setProp("index", i); return configServer; @@ -193,7 +188,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { } @Override - protected Slobrok doBuild(DeployState deployState, AbstractConfigProducer parent, Element spec) { + protected Slobrok doBuild(DeployState deployState, AbstractConfigProducer<?> parent, Element spec) { return new Slobrok(parent, i, deployState.featureFlags()); } @@ -209,7 +204,7 @@ public class DomAdminV2Builder extends DomAdminBuilderBase { } @Override - protected ClusterControllerContainer doBuild(DeployState deployState, AbstractConfigProducer parent, Element spec) { + protected ClusterControllerContainer doBuild(DeployState deployState, AbstractConfigProducer<?> parent, Element spec) { return new ClusterControllerContainer(parent, i, runStandaloneZooKeeper, deployState, false); } } |