Use a string for flag so we can have 3 values: OLD, BOTH, NEW

1 files changed, 3 insertions, 3 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 add2e24e07d..d915b18ebdf 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -397,10 +397,10 @@ public class Flags {
             "Takes effect at redeployment",
             ZONE_ID, APPLICATION_ID);
 
-    public static final UnboundBooleanFlag USE_NEW_CONTROLLER_LOCKS = defineFeatureFlag(
-            "transition-to-new-controller-locks", false,
+    public static final UnboundStringFlag CONTROLLER_LOCK_SCHEME = defineStringFlag(
+            "new-controller-lock-scheme", "OLD",
             List.of("hmusum"), "2022-04-07", "2022-05-07",
-            "Use two locks in transition period to new lock schema for application-related controller locks",
+            "Lock scheme to application-related controller locks (valid values: OLD, BOTH, NEW)",
             "Takes effect immediately",
             ZONE_ID);