Revert "Add missing writes to unified node path"

2 files changed, 2 insertions, 9 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index 2590db9434b..807710eac72 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -182,8 +182,8 @@ public class Nodes {
                 nodesToAdd.add(node);
             }
             NestedTransaction transaction = new NestedTransaction();
-            db.removeNodes(nodesToRemove, transaction);
             List<Node> resultingNodes = db.addNodesInState(IP.Config.verify(nodesToAdd, list(lock)), Node.State.provisioned, agent, transaction);
+            db.removeNodes(nodesToRemove, transaction);
             transaction.commit();
             return resultingNodes;
         }
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 4da788da7a3..c52d98fadc9 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
@@ -115,10 +115,7 @@ public class CuratorDb {
                 throw new IllegalArgumentException(node + " is not in the " + expectedState + " state");
 
             node = node.with(node.history().recordStateTransition(null, expectedState, agent, clock.instant()));
-            // TODO(mpolden): Remove after migration to nodesPath
-            byte[] serialized = nodeSerializer.toJson(node);
-            curatorTransaction.add(CuratorOperations.create(toPath(node).getAbsolute(), serialized));
-            curatorTransaction.add(CuratorOperations.create(nodePath(node).getAbsolute(), serialized));
+            curatorTransaction.add(CuratorOperations.create(toPath(node).getAbsolute(), nodeSerializer.toJson(node)));
         }
 
         for (Node node : nodes)
@@ -139,11 +136,7 @@ public class CuratorDb {
         for (Node node : nodes) {
             Path path = toPath(node.state(), node.hostname());
             CuratorTransaction curatorTransaction = db.newCuratorTransactionIn(transaction);
-            // TODO(mpolden): Remove after migration to nodesPath
             curatorTransaction.add(CuratorOperations.delete(path.getAbsolute()));
-            if (db.exists(nodePath(node))) {
-                curatorTransaction.add(CuratorOperations.delete(nodePath(node).getAbsolute()));
-            }
         }
         nodes.forEach(node -> log.log(Level.INFO, "Removed node " + node.hostname() + " in state " + node.state()));
     }