summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2021-10-09 20:00:08 +0200
committerGitHub <noreply@github.com>2021-10-09 20:00:08 +0200
commitad390fb973964e65348465d14af57827a7703bd0 (patch)
tree463dea37f4862e937f7490f4383c577d452bd39e
parent49acaa81c697eb979c67b4c7b816142c4b2b9e93 (diff)
parent53105adc62dd18ee48347aaac7c9eae482d6f832 (diff)
Merge pull request #19488 from vespa-engine/bratseth/reduce-memory-tax-take-2
Add host memory feature flag
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java11
1 files changed, 10 insertions, 1 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 76ae5b16fe7..ae5317ecb53 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
@@ -201,7 +201,16 @@ public class PermanentFlags {
"config-proxy-jvm-args", "",
"Sets jvm args for config proxy (added at the end of startup command, will override existing ones)",
"Takes effect on restart of Docker container",
- ZONE_ID, APPLICATION_ID);
+ ZONE_ID, APPLICATION_ID
+ );
+
+ // 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", 1.0,
+ "The memory required by a hosts management processes.",
+ "Takes effect immediately",
+ ZONE_ID
+ );
private PermanentFlags() {}