Add application name to OutOfCapacityException message

2 files changed, 3 insertions, 3 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 93704d244b5..d31b4438a38 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
@@ -9,7 +9,6 @@ import com.yahoo.transaction.Mutex;
 import com.yahoo.vespa.hosted.provision.Node;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 
-import java.time.Clock;
 import java.util.List;
 
 /**
@@ -67,6 +66,7 @@ public class GroupPreparer {
                 allocation.offer(prioritizer.prioritize());
                 if (! allocation.fullfilled())
                     throw new OutOfCapacityException("Could not satisfy " + requestedNodes + " for " + cluster +
+                                                     " in " + application.toShortString() +
                                                      outOfCapacityDetails(allocation));
 
                 // Extend reservation for already reserved nodes
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
index e1b1d74c6d0..2cabee98c0d 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java
@@ -160,13 +160,13 @@ public class DockerProvisioningTest {
         assertEquals(setOf("host1", "host2"), hostsOf(tester.getNodes(application1, Node.State.active)));
 
         try {
-            ApplicationId application2 = tester.makeApplicationId();
+            ApplicationId application2 = ApplicationId.from("tenant1", "app1", "default");
             prepareAndActivate(application2, 3, false, tester);
             fail("Expected allocation failure");
         }
         catch (Exception e) {
             assertEquals("No room for 3 nodes as 2 of 4 hosts are exclusive",
-                         "Could not satisfy request for 3 nodes of flavor 'dockerSmall' for container cluster 'myContainer' group 0 6.39: Not enough nodes available due to host exclusivity constraints.",
+                         "Could not satisfy request for 3 nodes of flavor 'dockerSmall' for container cluster 'myContainer' group 0 6.39 in tenant1.app1: Not enough nodes available due to host exclusivity constraints.",
                          e.getMessage());
         }