Merge pull request #25612 from vespa-engine/balder/gc-ignore-thread-stack-sizes-feature-flag

Balder/gc ignore thread stack sizes feature flag

2 files changed, 4 insertions, 13 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java b/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java
index dfb5b1d3e22..bdb33d11225 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ConfigSentinel.java
@@ -19,20 +19,17 @@ public class ConfigSentinel extends AbstractService implements SentinelConfig.Pr
 
     private final ApplicationId applicationId;
     private final Zone zone;
-    private final boolean ignoreRequestedStackSizes;
 
     /**
      * Constructs a new ConfigSentinel for the given host.
      *
      * @param host Physical host on which to run.
      */
-    public ConfigSentinel(Host host, ApplicationId applicationId, Zone zone,
-                          ModelContext.FeatureFlags featureFlags)
+    public ConfigSentinel(Host host, ApplicationId applicationId, Zone zone)
     {
         super(host, "sentinel");
         this.applicationId = applicationId;
         this.zone = zone;
-        this.ignoreRequestedStackSizes = featureFlags.ignoreThreadStackSizes();
         portsMeta.on(0).tag("rpc").tag("admin");
         portsMeta.on(1).tag("telnet").tag("interactive").tag("http").tag("state");
         setProp("clustertype", "hosts");
@@ -75,7 +72,6 @@ public class ConfigSentinel extends AbstractService implements SentinelConfig.Pr
     @Override
     public void getConfig(SentinelConfig.Builder builder) {
         builder.application(getApplicationConfig());
-        builder.ignoreRequestedStackSizes(ignoreRequestedStackSizes);
         for (Service s : getHostResource().getServices()) {
             s.getStartupCommand().ifPresent(command -> builder.service(getServiceConfig(s, command)));
         }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
index e29615b7fb3..67a5b27533d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java
@@ -1,16 +1,13 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.admin;
 
-import com.yahoo.config.model.api.ModelContext;
 import com.yahoo.cloud.config.SlobroksConfig;
 import com.yahoo.cloud.config.ZookeepersConfig;
 import com.yahoo.cloud.config.log.LogdConfig;
 import com.yahoo.config.model.ConfigModelContext.ApplicationType;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
-import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.model.AbstractService;
 import com.yahoo.vespa.model.ConfigProxy;
 import com.yahoo.vespa.model.ConfigSentinel;
@@ -250,8 +247,7 @@ public class Admin extends AbstractConfigProducer<Admin> implements Serializable
     }
 
     private void addCommonServices(HostResource host, DeployState deployState) {
-        addConfigSentinel(deployState, host, deployState.getProperties().applicationId(), deployState.zone(),
-                          deployState.featureFlags());
+        addConfigSentinel(deployState, host);
         addLogd(deployState, host);
         addConfigProxy(deployState, host);
         addFileDistribution(host);
@@ -271,10 +267,9 @@ public class Admin extends AbstractConfigProducer<Admin> implements Serializable
         }
     }
 
-    private void addConfigSentinel(DeployState deployState, HostResource host,
-                                   ApplicationId applicationId, Zone zone, ModelContext.FeatureFlags featureFlags)
+    private void addConfigSentinel(DeployState deployState, HostResource host)
     {
-        ConfigSentinel configSentinel = new ConfigSentinel(host.getHost(), applicationId, zone, featureFlags);
+        ConfigSentinel configSentinel = new ConfigSentinel(host.getHost(), deployState.getProperties().applicationId(), deployState.zone());
         addAndInitializeService(deployState, host, configSentinel);
         host.getHost().setConfigSentinel(configSentinel);
     }