GC fully deployed available-processors flag

4 files changed, 2 insertions, 18 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index fe1d187979e..61bf9029bd5 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -96,7 +96,7 @@ public interface ModelContext {
         @ModelFeatureFlag(owners = {"baldersheim"}) default double feedConcurrency() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"baldersheim"}) default double feedNiceness() { return 0.0; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default int defaultPoolNumThreads() { return 2; }
-        @ModelFeatureFlag(owners = {"baldersheim"}) default int availableProcessors() { return 2; }
+        @ModelFeatureFlag(owners = {"baldersheim"}) default int availableProcessors() { return 1; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default int maxUnCommittedMemory() { return 130000; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default int maxConcurrentMergesPerNode() { return 16; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default int maxMergeQueueSize() { return 100; }
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 d58d1f4ae5d..d5cc168267e 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
@@ -148,7 +148,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
     private final ComponentGroup<Component<?, ?>> componentGroup;
     private final boolean isHostedVespa;
     private final boolean zooKeeperLocalhostAffinity;
-    private final int numAvailableProcessors;
     private final String compressionType;
 
     private final Map<String, String> concreteDocumentTypes = new LinkedHashMap<>();
@@ -169,7 +168,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         this.isHostedVespa = stateIsHosted(deployState);
         this.zone = (deployState != null) ? deployState.zone() : Zone.defaultZone();
         this.zooKeeperLocalhostAffinity = zooKeeperLocalhostAffinity;
-        this.numAvailableProcessors = deployState.featureFlags().availableProcessors();
         this.compressionType = deployState.featureFlags().logFileCompressionAlgorithm("zstd");
 
         componentGroup = new ComponentGroup<>(this, "component");
@@ -359,10 +357,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         this.containerDocproc = containerDocproc;
     }
 
-    public ContainerDocumentApi getDocumentApi() {
-        return containerDocumentApi;
-    }
-
     public void setDocumentApi(ContainerDocumentApi containerDocumentApi) {
         this.containerDocumentApi = containerDocumentApi;
     }
@@ -514,7 +508,7 @@ public abstract class ContainerCluster<CONTAINER extends Container>
     public void getConfig(QrStartConfig.Builder builder) {
         builder.jvm
                 .verbosegc(false)
-                .availableProcessors(numAvailableProcessors)
+                .availableProcessors(1)
                 .compressedClassSpaceSize(32)
                 .minHeapsize(32)
                 .heapsize(256)
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 1153017301f..ff31e181c5a 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
@@ -188,7 +188,6 @@ public class ModelContextImpl implements ModelContext {
         private final double resourceLimitMemory;
         private final double minNodeRatioPerGroup;
         private final int metricsproxyNumThreads;
-        private final int availableProcessors;
         private final boolean containerDumpHeapOnShutdownTimeout;
         private final boolean loadCodeAsHugePages;
         private final double containerShutdownTimeout;
@@ -251,7 +250,6 @@ public class ModelContextImpl implements ModelContext {
             this.resourceLimitMemory = flagValue(source, appId, version, PermanentFlags.RESOURCE_LIMIT_MEMORY);
             this.minNodeRatioPerGroup = flagValue(source, appId, version, Flags.MIN_NODE_RATIO_PER_GROUP);
             this.metricsproxyNumThreads = flagValue(source, appId, version, Flags.METRICSPROXY_NUM_THREADS);
-            this.availableProcessors = flagValue(source, appId, version, Flags.AVAILABLE_PROCESSORS);
             this.containerDumpHeapOnShutdownTimeout = flagValue(source, appId, version, Flags.CONTAINER_DUMP_HEAP_ON_SHUTDOWN_TIMEOUT);
             this.loadCodeAsHugePages = flagValue(source, appId, version, Flags.LOAD_CODE_AS_HUGEPAGES);
             this.containerShutdownTimeout = flagValue(source, appId, version, Flags.CONTAINER_SHUTDOWN_TIMEOUT);
@@ -316,7 +314,6 @@ public class ModelContextImpl implements ModelContext {
         @Override public double resourceLimitMemory() { return resourceLimitMemory; }
         @Override public double minNodeRatioPerGroup() { return minNodeRatioPerGroup; }
         @Override public int defaultPoolNumThreads() { return metricsproxyNumThreads; }
-        @Override public int availableProcessors() { return availableProcessors; }
         @Override public double containerShutdownTimeout() { return containerShutdownTimeout; }
         @Override public boolean containerDumpHeapOnShutdownTimeout() { return containerDumpHeapOnShutdownTimeout; }
         @Override public boolean loadCodeAsHugePages() { return loadCodeAsHugePages; }
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index 088268d781b..300fe7f15bf 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -301,13 +301,6 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundIntFlag AVAILABLE_PROCESSORS = defineIntFlag(
-            "available-processors", 1,
-            List.of("balder"), "2022-01-18", "2023-01-01",
-            "Number of processors the jvm sees in non-application clusters",
-            "Takes effect at redeployment",
-            ZONE_ID, APPLICATION_ID);
-
     public static final UnboundBooleanFlag ENABLED_HORIZON_DASHBOARD = defineFeatureFlag(
             "enabled-horizon-dashboard", false,
             List.of("olaa"), "2021-09-13", "2022-10-01",