diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-09-19 13:53:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-19 13:53:03 +0200 |
commit | 2eeb7b8098d64290f3c08469457eaa76dd1bef05 (patch) | |
tree | 73afd4fa8e2c196c6b1bb5b5e25ab178df137acf /controller-server | |
parent | 9282b402c6871048f4be628849f25d37497eddfb (diff) | |
parent | dc8ef122f7078c31fd99d05138a17f3454664fc1 (diff) |
Merge pull request #24123 from vespa-engine/mpolden/remove-flag
Remove controller-lock-scheme flag
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java | 29 |
1 files changed, 0 insertions, 29 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 */ |