diff options
author | jonmv <venstad@gmail.com> | 2023-07-12 18:19:10 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-07-12 18:19:10 +0200 |
commit | fcabb9aff7799ad13dc91c289b81c3dd8f3cb439 (patch) | |
tree | cb11b66252af4a8ed20daf60aacc0fe8879a9ce4 | |
parent | 14f7beef22397deba6f80fb3f0de5a51053a7960 (diff) |
Add two TODOs about locks taken in the wrong order
2 files changed, 2 insertions, 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 index 766bc688c62..a16290361fb 100644 --- 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 @@ public class NodeFailer extends NodeRepositoryMaintainer { // 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/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java index 1ae9b00d794..bf046c09899 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java @@ -72,7 +72,7 @@ public class RetiredExpirer extends NodeRepositoryMaintainer { } 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() |