Use remote storage with very small disks

1 files changed, 9 insertions, 6 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java
index 6e85e2f9649..1406aaecb71 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java
@@ -164,18 +164,21 @@ public class AllocatableClusterResources {
         if (! exclusive) {
             // We decide resources: Add overhead to what we'll request (advertised) to make sure real becomes (at least) cappedNodeResources
             var advertisedResources = nodeRepository.resourcesCalculator().realToRequest(wantedResources.nodeResources(), exclusive);
-            System.out.println("realToRequest: " + wantedResources.nodeResources() + " -> " + advertisedResources);
             advertisedResources = systemLimits.enlargeToLegal(advertisedResources, clusterSpec, exclusive); // Ask for something legal
             advertisedResources = applicationLimits.cap(advertisedResources); // Overrides other conditions, even if it will then fail
             var realResources = nodeRepository.resourcesCalculator().requestToReal(advertisedResources, exclusive); // What we'll really get
-            System.out.println("requestToReal: " + advertisedResources + " -> " + realResources);
+            if ( ! systemLimits.isWithinRealLimits(realResources, clusterSpec) && advertisedResources.storageType() == NodeResources.StorageType.any) {
+                // Since local disk resreves some of the storage, try to constrain to remote disk
+                advertisedResources = advertisedResources.with(NodeResources.StorageType.remote);
+                realResources = nodeRepository.resourcesCalculator().requestToReal(advertisedResources, exclusive);
+            }
             if ( ! systemLimits.isWithinRealLimits(realResources, clusterSpec))
                 return Optional.empty();
             if (anySatisfies(realResources, availableRealHostResources))
-                    return Optional.of(new AllocatableClusterResources(wantedResources.with(realResources),
-                                                                       advertisedResources,
-                                                                       wantedResources,
-                                                                       clusterSpec));
+                return Optional.of(new AllocatableClusterResources(wantedResources.with(realResources),
+                                                                   advertisedResources,
+                                                                   wantedResources,
+                                                                   clusterSpec));
             else
                 return Optional.empty();
         }