summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon.hallingstad@gmail.com>2023-08-07 13:02:20 +0200
committerGitHub <noreply@github.com>2023-08-07 13:02:20 +0200
commita3f179b28938e96198efab485edb6a247be54918 (patch)
tree1d8a6e785a4ab3c5e8fcabb4ad55e8e078cd8b41 /flags
parentf751674a577001809bcf1566bece266e862acc83 (diff)
parent43f83bc9bd4b94b09f06a9ce95e05710b6addd75 (diff)
Merge pull request #27974 from vespa-engine/hakonhall/make-drop-caches-flag-permanent
Make drop-caches flag permanent
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java11
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java8
2 files changed, 8 insertions, 11 deletions
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 919b31fa5d4..c6d141764fb 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -14,8 +14,6 @@ import java.util.TreeMap;
import java.util.function.Predicate;
import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.CLUSTER_ID;
-import static com.yahoo.vespa.flags.FetchVector.Dimension.CLUSTER_TYPE;
import static com.yahoo.vespa.flags.FetchVector.Dimension.CONSOLE_USER_EMAIL;
import static com.yahoo.vespa.flags.FetchVector.Dimension.HOSTNAME;
import static com.yahoo.vespa.flags.FetchVector.Dimension.NODE_TYPE;
@@ -47,15 +45,6 @@ public class Flags {
private static volatile TreeMap<FlagId, FlagDefinition> flags = new TreeMap<>();
- public static final UnboundBooleanFlag DROP_CACHES = defineFeatureFlag(
- "drop-caches", false,
- List.of("hakonhall", "baldersheim"), "2023-03-06", "2023-08-05",
- "Drop caches on tenant hosts",
- "Takes effect on next tick",
- // The application ID is the exclusive application ID associated with the host,
- // if any, or otherwise hosted-vespa:tenant-host:default.
- APPLICATION_ID, TENANT_ID, CLUSTER_ID, CLUSTER_TYPE);
-
public static final UnboundDoubleFlag DEFAULT_TERM_WISE_LIMIT = defineDoubleFlag(
"default-term-wise-limit", 1.0,
List.of("baldersheim"), "2020-12-02", "2023-12-31",
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 8823fc47d92..619dd39ca47 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java
@@ -376,6 +376,14 @@ public class PermanentFlags {
"triggered",
"Takes effect immediately");
+ public static final UnboundBooleanFlag DROP_CACHES = defineFeatureFlag(
+ "drop-caches", false,
+ "Drop caches on tenant hosts",
+ "Takes effect on next tick",
+ // The application ID is the exclusive application ID associated with the host,
+ // if any, or otherwise hosted-vespa:tenant-host:default.
+ APPLICATION_ID, TENANT_ID, CLUSTER_ID, CLUSTER_TYPE);
+
private PermanentFlags() {}
private static UnboundBooleanFlag defineFeatureFlag(