Assign rotations on submission

2 files changed, 7 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 0eca30ddeec..7c718518129 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -10,6 +10,7 @@ import com.yahoo.config.application.api.ValidationId;
 import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.config.provision.zone.ZoneId;
@@ -403,9 +404,6 @@ public class ApplicationController {
                     application = storeWithUpdatedConfig(application, applicationPackage);
                 }
 
-                if (zone.environment().isProduction()) // Assign and register endpoints
-                    application = withRotation(applicationPackage.deploymentSpec(), application, instance);
-
                 endpoints = registerEndpointsInDns(applicationPackage.deploymentSpec(), application.get().require(instanceId.instance()), zone);
             } // Release application lock while doing the deployment, which is a lengthy task.
 
@@ -481,6 +479,11 @@ public class ApplicationController {
                 application = application.with(name, instance -> withoutUnreferencedDeploymentJobs(deploymentSpec, instance));
             }
         }
+
+        for (InstanceName instance : declaredInstances)
+            if (applicationPackage.deploymentSpec().requireInstance(instance).deploysTo(Environment.prod))
+                application = withRotation(applicationPackage.deploymentSpec(), application, instance);
+
         store(application);
         return application;
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
index af6017c1188..d35d6d1d4a0 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
@@ -214,7 +214,7 @@ public class MetricsReporterTest {
 
         context.submit(applicationPackage).deploy();
         reporter.maintain();
-        assertEquals("Deployment queues name services requests", 6, metrics.getMetric(MetricsReporter.NAME_SERVICE_REQUESTS_QUEUED).intValue());
+        assertEquals("Deployment queues name services requests", 15, metrics.getMetric(MetricsReporter.NAME_SERVICE_REQUESTS_QUEUED).intValue());
 
         context.flushDnsUpdates();
         reporter.maintain();