Add two TODOs about locks taken in the wrong order

vespa-engine · Jul 12, 2023 · fcabb9a · fcabb9a
1 parent 14f7bee
commit fcabb9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailer.java
@@ -208,7 +208,7 @@ private void failActive(FailingNode failing) {
         // so we must release ours before failing the children.
         List<FailingNode> activeChildrenToFail = new ArrayList<>();
         boolean redeploy = false;
-        try (NodeMutex lock = nodeRepository().nodes().lockAndGetRequired(failing.node())) {
+        try (NodeMutex lock = nodeRepository().nodes().lockAndGetRequired(failing.node())) { // TODO: recursive lock for right order, only for hosts though
             // Now that we have gotten the node object under the proper lock, sanity-check it still makes sense to fail
             if (!Objects.equals(failing.node().allocation().map(Allocation::owner), lock.node().allocation().map(Allocation::owner)))
                 return;

diff --git a/...repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java b/...repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
@@ -72,7 +72,7 @@ private boolean removeRetiredNodes(ApplicationId application) {
             }
             boolean redeploy = false;
             List<String> nodesToDeactivate = new ArrayList<>();
-            try (var lock = nodeRepository().applications().lock(application)) {
+            try (var lock = nodeRepository().applications().lock(application)) { // TODO: take recusrive lock for right order
                 NodeList activeNodes = nodeRepository().nodes().list(Node.State.active);
                 Map<Removal, NodeList> nodesByRemovalReason = activeNodes.owner(application)
                                                                          .retired()