diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-09-14 15:48:16 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-09-15 10:55:50 +0200 |
| commit | da37dd3e20853339cdd0614e83cb1e1afb298219 (patch) | |
| tree | 0a988cb5bd5d314f8c201e8c4f31033e62823ccf /controller-server | |
| parent | d16105d08e5c5a9164793f9350c8461705bf46ad (diff) | |
Remove unused lock paths
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, 29 insertions, 0 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 23271bc62a0..1559cc29b22 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,6 +122,29 @@ 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); @@ -130,6 +153,12 @@ 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 */ |