diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-07-01 14:29:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-01 14:29:41 +0200 |
commit | 56aaa96c30c76b050756a85eaa802d57c86c19f1 (patch) | |
tree | 27d2055ec202544e0f2a0626bad23829a4b1292c /config-model/src/main/java/com | |
parent | 3f74655e8ec3590d0c42212df577a7b01bdd292d (diff) | |
parent | 2370e1dbe3184a6ba8ceff4fe7c7b3a1968ea002 (diff) |
Merge pull request #23313 from vespa-engine/bjorncs/bundles
Bjorncs/bundles
Diffstat (limited to 'config-model/src/main/java/com')
3 files changed, 12 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java index f303da6c9f0..1da5e190c70 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java @@ -49,7 +49,7 @@ public class ClusterControllerContainer extends Container implements private static final int DEFAULT_NETTY_NUM_DIRECT_ARENAS = 1; // Reduced from nettys default of 2*cores private static final int DEFAULT_NETTY_NUM_HEAP_ARENAS = 1; // Reduced from nettys default of 2*cores - private final Set<String> bundles = new TreeSet<>(); + private final Set<String> bundles = new TreeSet<>(); // Ensure stable ordering public ClusterControllerContainer(AbstractConfigProducer<?> parent, int index, diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 2b6efab3389..cb4fe8f67ca 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -36,7 +36,6 @@ import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.component.Handler; import com.yahoo.vespa.model.container.component.SystemBindingPattern; import com.yahoo.vespa.model.container.configserver.ConfigserverCluster; -import com.yahoo.vespa.model.container.docproc.DocprocChains; import com.yahoo.vespa.model.utils.FileSender; import java.util.ArrayList; @@ -115,6 +114,14 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat addMetricsHandlers(); addTestrunnerComponentsIfTester(deployState); + addPlatformBundlesForApplicationCluster(); + } + + private void addPlatformBundlesForApplicationCluster() { + Set<String> bundles = Set.of( + "container-search-and-docproc", "container-search-gui", "docprocs", + "linguistics-components", "vespaclient-container-plugin"); + bundles.forEach(b -> addPlatformBundle(PlatformBundles.absoluteBundlePath(b))); } @Override 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 47633fc5191..3d4b6dcbe7e 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 @@ -29,8 +29,8 @@ import com.yahoo.metrics.simple.runtime.MetricProperties; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.prelude.semantics.SemanticRulesConfig; import com.yahoo.search.config.IndexInfoConfig; -import com.yahoo.search.config.SchemaInfoConfig; import com.yahoo.search.config.QrStartConfig; +import com.yahoo.search.config.SchemaInfoConfig; import com.yahoo.search.pagetemplates.PageTemplatesConfig; import com.yahoo.search.query.profile.config.QueryProfilesConfig; import com.yahoo.vespa.configdefinition.IlscriptsConfig; @@ -64,12 +64,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; +import java.util.TreeSet; /** * Parent class for all container cluster types. @@ -140,7 +140,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> private boolean rpcServerEnabled = true; private boolean httpServerEnabled = true; - private final Set<Path> platformBundles = new LinkedHashSet<>(); + private final Set<Path> platformBundles = new TreeSet<>(); // Ensure stable ordering private final ComponentGroup<Component<?, ?>> componentGroup; private final boolean isHostedVespa; |