diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2023-01-16 15:00:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-16 15:00:29 +0100 |
| commit | a41d19b20d419270d3d5505cbd4b52f4ee4e498e (patch) | |
| tree | 7664a780d0e66281513d8fb21edec7278d5c2f23 | |
| parent | f6054b619d621289a7ddfe99150ca3b650117f97 (diff) | |
| parent | b74eb97e82df85e7542e80e7201fddd3952d5a43 (diff) | |
Merge pull request #25583 from vespa-engine/mpolden/new-node-path-4
Prune legacy node paths
2 files changed, 2 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CachingCurator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CachingCurator.java index 589468c48b8..29ee378c906 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CachingCurator.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CachingCurator.java @@ -68,7 +68,7 @@ public class CachingCurator { .toList(); } - // TODO(mpolden): Remove this + // TODO(mpolden): Remove after 2023-02-01 public void deleteRecursively(Path path) { curator.delete(path); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java index 74d88d4e73c..9211a7cce15 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java @@ -94,8 +94,7 @@ public class CuratorDb { private void initZK() { db.create(root); db.create(nodesPath); - // TODO(mpolden): Remove state paths after migration to nodesPath - // removeLegacyPaths(); + removeLegacyPaths(); // TODO(mpolden): Remove after 2023-02-01 db.create(applicationsPath); db.create(inactiveJobsPath); db.create(infrastructureVersionsPath); |