diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-01 14:01:00 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-01 14:01:00 +0200 |
commit | 2370e1dbe3184a6ba8ceff4fe7c7b3a1968ea002 (patch) | |
tree | bc8014b2141568c8d4861766b1c09ce2513b59b0 /config-model/src/main/java/com/yahoo | |
parent | 6b2d7d130008ae83b91094b9aab4716eb3b4d55c (diff) |
Ensure stable ordering of platform bundles
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
2 files changed, 4 insertions, 4 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/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; |