diff options
author | Håkon Hallingstad <hakon@yahooinc.com> | 2024-05-19 10:34:01 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@yahooinc.com> | 2024-05-19 10:34:01 +0200 |
commit | 107c802740ff383c9bd6796cc8c012ee86f54afc (patch) | |
tree | 82a8c7ce1720e2b7234be62d15f96013d0ad4314 /configserver/src/main/java/com | |
parent | 708081bd3c30c1f974bf25f025ec7f97ca4aaa26 (diff) |
Actually resolve the admin-cluster-node-architecture flag
Diffstat (limited to 'configserver/src/main/java/com')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 37ac67f2c5f..c8d3574182a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -25,6 +25,8 @@ import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.DataplaneToken; import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.HostName; +import com.yahoo.config.provision.NodeResources; +import com.yahoo.config.provision.NodeResources.Architecture; import com.yahoo.config.provision.SharedHosts; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.secretstore.SecretStore; @@ -210,6 +212,7 @@ public class ModelContextImpl implements ModelContext { private final int persistenceThreadMaxFeedOpBatchSize; private final boolean logserverOtelCol; private final SharedHosts sharedHosts; + private final Architecture adminClusterArchitecture; public FeatureFlags(FlagSource source, ApplicationId appId, Version version) { this.defaultTermwiseLimit = flagValue(source, appId, version, Flags.DEFAULT_TERM_WISE_LIMIT); @@ -255,6 +258,7 @@ public class ModelContextImpl implements ModelContext { this.persistenceThreadMaxFeedOpBatchSize = flagValue(source, appId, version, Flags.PERSISTENCE_THREAD_MAX_FEED_OP_BATCH_SIZE); this.logserverOtelCol = flagValue(source, appId, version, Flags.LOGSERVER_OTELCOL_AGENT); this.sharedHosts = flagValue(source, appId, version, PermanentFlags.SHARED_HOST); + this.adminClusterArchitecture = Architecture.valueOf(flagValue(source, appId, version, PermanentFlags.ADMIN_CLUSTER_NODE_ARCHITECTURE)); } @Override public int heapSizePercentage() { return heapPercentage; } @@ -308,6 +312,7 @@ public class ModelContextImpl implements ModelContext { @Override public int persistenceThreadMaxFeedOpBatchSize() { return persistenceThreadMaxFeedOpBatchSize; } @Override public boolean logserverOtelCol() { return logserverOtelCol; } @Override public SharedHosts sharedHosts() { return sharedHosts; } + @Override public Architecture adminClusterArchitecture() { return adminClusterArchitecture; } private static <V> V flagValue(FlagSource source, ApplicationId appId, Version vespaVersion, UnboundFlag<? extends V, ?, ?> flag) { return flag.bindTo(source) |