diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-06-14 11:21:32 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-06-14 11:24:01 +0200 |
commit | df6d6e333bbe8ed6b78d7d9a38ff16349a7a5c4a (patch) | |
tree | 8a663327ffc274216ee7f7470af85cf9747b995c /config-model | |
parent | 14af27809f639ffa7b6193d664dc1d421ffcc1a0 (diff) |
Load bundle only conditionally
Diffstat (limited to 'config-model')
-rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 286853548e2..c6fdfe7b744 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -191,8 +191,8 @@ public abstract class ContainerCluster<CONTAINER extends Container> addSimpleComponent("com.yahoo.container.jdisc.ContainerThreadFactory"); addSimpleComponent("com.yahoo.container.handler.VipStatus"); addSimpleComponent(com.yahoo.container.handler.ClustersStatus.class.getName()); - addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("vespa-testrunner-components-jar-with-dependencies.jar"))); addJaxProviders(); + addTestrunnerComponentsIfTester(deployState); } public void setZone(Zone zone) { @@ -207,6 +207,11 @@ public abstract class ContainerCluster<CONTAINER extends Container> addVipHandler(); } + private void addTestrunnerComponentsIfTester(DeployState deployState) { + if (deployState.getProperties().applicationId().instance().isTester()) + addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("vespa-testrunner-components-jar-with-dependencies.jar"))); + } + public final void addDefaultHandlersExceptStatus() { addDefaultRootHandler(); addMetricStateHandler(); |