Don't throw InvalidApplicationException when there are node allocation issues

1 files changed, 5 insertions, 0 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
index 49e200f9640..aed614a5c57 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/PreparedModelsBuilder.java
@@ -24,6 +24,7 @@ import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.provision.AllocatedHosts;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.DockerImage;
+import com.yahoo.config.provision.NodeAllocationException;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.jdisc.secretstore.SecretStore;
 import com.yahoo.vespa.config.server.application.Application;
@@ -194,6 +195,10 @@ public class PreparedModelsBuilder extends ModelsBuilder<PreparedModelsBuilder.P
             }
         } while (Instant.now().isBefore(end));
 
+        if (configserverConfig.hostedVespa())
+            // Use another exception, as this is not a problem with the application package
+            throw new NodeAllocationException(exception.getMessage(), true);
+
         throw exception;
     }