Merge pull request #30993 from vespa-engine/hakonhall/add-host-memory-ratio-flag

Add host-memory-ratio flag and add flavor dimension to host-memory

1 files changed, 14 insertions, 5 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
index 24e385a59e0..ad9f4c6a7ab 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
@@ -18,6 +18,7 @@ import static com.yahoo.vespa.flags.Dimension.ARCHITECTURE;
 import static com.yahoo.vespa.flags.Dimension.CERTIFICATE_PROVIDER;
 import static com.yahoo.vespa.flags.Dimension.CLAVE;
 import static com.yahoo.vespa.flags.Dimension.CLOUD_ACCOUNT;
+import static com.yahoo.vespa.flags.Dimension.FLAVOR;
 import static com.yahoo.vespa.flags.Dimension.INSTANCE_ID;
 import static com.yahoo.vespa.flags.Dimension.CLUSTER_ID;
 import static com.yahoo.vespa.flags.Dimension.CLUSTER_TYPE;
@@ -278,11 +279,19 @@ public class PermanentFlags {
 
     // This must be set in a feature flag to avoid flickering between the new and old value during config server upgrade
     public static final UnboundDoubleFlag HOST_MEMORY = defineDoubleFlag(
-            "host-memory", 0.6,
-            "The memory in GB required by a host's management processes.",
-            "Takes effect immediately",
-            CLOUD_ACCOUNT, CLAVE, ARCHITECTURE
-    );
+            "host-memory", -1.0,
+            "The memory in GB required by a host's management processes. " +
+            "A negative value falls back to hard-coded defaults.",
+            "Affects future deployments, JVM settings for new config server Podman containers, auto scaling modelling.",
+            ARCHITECTURE, CLAVE, CLOUD_ACCOUNT, FLAVOR);
+
+    // This must be set in a feature flag to avoid flickering between the new and old value during config server upgrade
+    public static final UnboundDoubleFlag HOST_MEMORY_RATIO = defineDoubleFlag(
+            "host-memory-ratio", -1.0,
+            "The ratio of MemTotal reserved for Linux or host processes, and not available to the Podman containers. " +
+            "A value outside the range [0.0, 1.0] will use a hard-coded ratio.",
+            "Affects future deployments, JVM settings for new config server Podman containers, auto scaling modelling.",
+            ARCHITECTURE, CLAVE, CLOUD_ACCOUNT, FLAVOR);
 
     public static final UnboundBooleanFlag FORWARD_ISSUES_AS_ERRORS = defineFeatureFlag(
             "forward-issues-as-errors", true,