diff options
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java | 29 | ||||
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 6 |
2 files changed, 0 insertions, 35 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java index a1ecc07683e..0e8f1648765 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java @@ -122,29 +122,6 @@ public class CuratorDb { // For each job id (path), store the ZK node version and its deserialised data - update when version changes. private final Map<Path, Pair<Integer, NavigableMap<RunId, Run>>> cachedHistoricRuns = new ConcurrentHashMap<>(); - private static final Set<String> knownLockRootChildren = Set.of( - "applications", - "archiveBuckets", - "auditLog", - "changeRequests", - "confidenceOverrides", - "deploymentRetriggerQueue", - "instances", - "jobs", - "maintenanceJobLocks", - "meteringRefreshTime", - "nameServiceQueue", - "notifications", - "osTargetVersion", - "osVersionStatus", - "provisioning", - "rotations", - "routingPolicies", - "steps", - "supportAccess", - "tenants" - ); - @Inject public CuratorDb(Curator curator) { this(curator, defaultTryLockTimeout); @@ -153,12 +130,6 @@ public class CuratorDb { CuratorDb(Curator curator, Duration tryLockTimeout) { this.curator = curator; this.tryLockTimeout = tryLockTimeout; - // TODO(mpolden): Remove after 2022-09-26. This cleans up the immediate children of lock root which are no longer used - for (var path : curator.getChildren(lockRoot)) { - if (!knownLockRootChildren.contains(path)) { - curator.delete(lockRoot.append(path)); - } - } } /** Returns all hostnames configured to be part of this ZooKeeper cluster */ 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 092fb16d0cb..bc10433fe38 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -509,12 +509,6 @@ public class Flags { "Takes effect at redeployment", APPLICATION_ID); - public static final UnboundStringFlag CONTROLLER_LOCK_SCHEME = defineStringFlag( - "controller-lock-scheme", "OLD", - List.of("mpolden"), "2022-09-12", "2022-11-01", - "Lock scheme for tenant-related controller locks (valid values: OLD, BOTH, NEW)", - "Takes effect immediately"); - public static final UnboundBooleanFlag COMPUTE_COVERAGE_FROM_TARGET_ACTIVE_DOCS = defineFeatureFlag( "compute-coverage-from-target-active-docs", false, List.of("baldersheim", "vekterli"), "2022-09-13", "2022-11-01", |