Merge pull request #21158 from vespa-engine/mpolden/skip-reserved

Do not offer node moves to reserved hosts

1 files changed, 2 insertions, 0 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMover.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMover.java
index 57db874fb84..552db84748d 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMover.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMover.java
@@ -74,6 +74,8 @@ public abstract class NodeMover<MOVE> extends NodeRepositoryMaintainer {
             if (deployedRecently(applicationId)) continue;
             for (HostWithResources toHost : hostResources) {
                 if (toHost.node.hostname().equals(node.parentHostname().get())) continue;
+                if (toHost.node.reservedTo().isPresent() &&
+                    !toHost.node.reservedTo().get().equals(applicationId.tenant())) continue; // Reserved to a different tenant
                 if (spares.contains(toHost.node)) continue; // Do not offer spares as a valid move as they are reserved for replacement of failed nodes
                 if ( ! toHost.hasCapacity(node.resources())) continue;