diff options
| author | jonmv <venstad@gmail.com> | 2023-06-27 13:40:30 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-06-27 13:40:30 +0200 |
| commit | e37214ce7fb389b8703b301e3e1facd198f8a30e (patch) | |
| tree | aad3b1f9424d54e3ce538f925bdccb45e6cebc0f | |
| parent | 8361d98b46bd25f6113d50624fd26e8b73f765b7 (diff) | |
Do not take tenant-host lock in addNodes after all
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java | 3 |
1 files changed, 1 insertions, 2 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 003e85f6404..d3ea1a3def7 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 @@ -164,8 +164,7 @@ public class Nodes { * with the history of that node. */ public List<Node> addNodes(List<Node> nodes, Agent agent) { - try (NodeMutexes existingNodesLocks = lockAndGetAll(nodes, Optional.empty()); // Locks for any existing nodes we may remove. - Mutex allocationLock = lockUnallocated()) { + try (Mutex allocationLock = lockUnallocated()) { List<Node> nodesToAdd = new ArrayList<>(); List<Node> nodesToRemove = new ArrayList<>(); for (int i = 0; i < nodes.size(); i++) { |