Merge branch 'master' into hmusum/change-default-value-of-configserver-distribute-application-package

1 files changed, 25 insertions, 0 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 3a11da758ed..0cc4777320e 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -196,6 +196,24 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
+    public static final UnboundStringFlag TLS_COMPRESSION_TYPE = defineStringFlag(
+            "tls-compression-type", "NONE",
+            "Selects type of compression, valid values are NONE, NONE_MULTI, LZ4, ZSTD",
+            "Takes effect at redeployment",
+            ZONE_ID, APPLICATION_ID);
+
+    public static final UnboundBooleanFlag TLS_USE_FSYNC = defineFeatureFlag(
+            "tls-use-fsync", false,
+            "Whether to use fsync when writing to the TLS.",
+            "Takes effect at redeployment",
+            ZONE_ID, APPLICATION_ID);
+
+    public static final UnboundDoubleFlag VISIBILITY_DELAY = defineDoubleFlag(
+            "visibility-delay", 0.0,
+            "Default visibility-delay",
+            "Takes effect at redeployment",
+            ZONE_ID, APPLICATION_ID);
+
     public static final UnboundBooleanFlag USE_DIRECT_STORAGE_API_RPC = defineFeatureFlag(
             "use-direct-storage-api-rpc", false,
             "Whether to use direct RPC for Storage API communication between content cluster nodes.",
@@ -368,6 +386,13 @@ public class Flags {
             APPLICATION_ID
     );
 
+    public static final UnboundBooleanFlag USE_CONFIG_SERVER_VIP = defineFeatureFlag(
+            "use-config-server-vip",
+            false,
+            "Whether the controller should use a config server VIP or not",
+            "Takes effect immediately"
+    );
+
     /** WARNING: public for testing: All flags should be defined in {@link Flags}. */
     public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description,
                                                        String modificationEffect, FetchVector.Dimension... dimensions) {