aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2023-01-05 11:05:37 +0100
committerMartin Polden <mpolden@mpolden.no>2023-01-05 11:05:37 +0100
commit3df0742647765e4b466644c4fb7f10000861eca7 (patch)
tree552f869d7d344dd5d66a30bfc9dbcb4c1fb5ea38 /node-repository/src
parenta7e56e6637b8f2d021d42ad50401efed0a2b739a (diff)
Delete new path
Diffstat (limited to 'node-repository/src')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CachingCurator.java5
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDb.java1
2 files changed, 6 insertions, 0 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 eb73fd51f4a..90d30a3a8bc 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,6 +68,11 @@ public class CachingCurator {
.toList();
}
+ // TODO(mpolden): Remove this
+ public void deleteRecursively(Path path) {
+ curator.delete(path);
+ }
+
/** Create a reentrant lock */
public Lock lock(Path path, Duration timeout) {
return curator.lock(path, timeout);
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 cebc185360a..38df1725662 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
@@ -93,6 +93,7 @@ public class CuratorDb {
private void initZK() {
db.create(root);
+ db.deleteRecursively(nodesPath); // TODO(mpolden): Remove before we start reading from this path
db.create(nodesPath);
// TODO(mpolden): Remove state paths after migration to nodesPath
for (Node.State state : Node.State.values())