Improve error message

2 files changed, 13 insertions, 5 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
index 980cd628f3c..e69a67d425c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
@@ -112,8 +112,7 @@ public class GroupPreparer {
                 }
 
                 if (! allocation.fulfilled() && requestedNodes.canFail())
-                    throw new OutOfCapacityException("Could not satisfy " + requestedNodes + " for " + cluster +
-                                                     " in " + application.toShortString() +
+                    throw new OutOfCapacityException((cluster.group().isPresent() ? "Out of capacity on " + cluster.group().get() :"") +
                                                      allocation.outOfCapacityDetails());
 
                 // Carry out and return allocation
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
index f88caffa6c6..163cdc57d9a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.provision.provisioning;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.OutOfCapacityException;
 import com.yahoo.lang.MutableInteger;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.hosted.provision.Node;
@@ -38,9 +39,17 @@ class Preparer {
 
     /** Prepare all required resources for the given application and cluster */
     public List<Node> prepare(ApplicationId application, ClusterSpec cluster, NodeSpec requestedNodes, int wantedGroups) {
-        var nodes = prepareNodes(application, cluster, requestedNodes, wantedGroups);
-        prepareLoadBalancer(application, cluster, requestedNodes);
-        return nodes;
+        try {
+            var nodes = prepareNodes(application, cluster, requestedNodes, wantedGroups);
+            prepareLoadBalancer(application, cluster, requestedNodes);
+            return nodes;
+        }
+        catch (OutOfCapacityException e) {
+            throw new OutOfCapacityException("Could not satisfy " + requestedNodes +
+                                             ( wantedGroups > 1 ? " ( in " + wantedGroups + " groups)" : "") +
+                                             " in " + application + " " + cluster +
+                                             ": " + e.getMessage());
+        }
     }
 
     /**