Defer changes until restart

In container clusters, if it is determined that a restart is required to swicth
to a new config generation, mark that config as applicable only after a restart.

This avoids wasting resources on a config change just before a restart, and the
potential of prematurely applying config changes which depend on other changes
which are not effective before a restart has been done.

13 files changed, 63 insertions, 24 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java
index d243a2dacf6..594f5a13546 100644
--- a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java
@@ -38,7 +38,7 @@ public class DeployStateTest {
     @Test
     public void testProvisionerIsSet() {
         DeployState.Builder builder = new DeployState.Builder();
-        HostProvisioner provisioner = new InMemoryProvisioner(true, "foo.yahoo.com");
+        HostProvisioner provisioner = new InMemoryProvisioner(true, false, "foo.yahoo.com");
         builder.modelHostProvisioner(provisioner);
         DeployState state = builder.build();
         assertThat(state.getProvisioner(), is(provisioner));
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 26d8a9b0eca..e3a53c8c4f1 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -103,7 +103,7 @@ public class ModelProvisioningTest {
                 + " </host>"
                 + "</hosts>";
         VespaModelCreatorWithMockPkg creator = new VespaModelCreatorWithMockPkg(null, services);
-        VespaModel model = creator.create(new DeployState.Builder().modelHostProvisioner(new InMemoryProvisioner(Hosts.readFrom(new StringReader(hosts)), true)));
+        VespaModel model = creator.create(new DeployState.Builder().modelHostProvisioner(new InMemoryProvisioner(Hosts.readFrom(new StringReader(hosts)), true, false)));
         ApplicationContainerCluster mydisc = model.getContainerClusters().get("mydisc");
         ApplicationContainerCluster mydisc2 = model.getContainerClusters().get("mydisc2");
         assertEquals(3, mydisc.getContainers().size());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
index 71dc1564277..f1f794c5057 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/DedicatedAdminV4Test.java
@@ -236,7 +236,7 @@ public class DedicatedAdminV4Test {
                 .build();
         return new VespaModel(new NullConfigModelRegistry(), deployStateBuilder
                 .applicationPackage(app)
-                .modelHostProvisioner(new InMemoryProvisioner(Hosts.readFrom(app.getHosts()), true))
+                .modelHostProvisioner(new InMemoryProvisioner(Hosts.readFrom(app.getHosts()), true, false))
                 .build());
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java
index 9eb3f9b8541..12f0c7013e5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java
@@ -20,13 +20,13 @@ public class QuotaValidatorTest {
 
     @Test
     public void test_deploy_under_quota() {
-        var tester = new ValidationTester(5, new TestProperties().setHostedVespa(true).setQuota(quota));
+        var tester = new ValidationTester(5, false, new TestProperties().setHostedVespa(true).setQuota(quota));
         tester.deploy(null, getServices("testCluster", 5), Environment.prod, null);
     }
 
     @Test
     public void test_deploy_above_quota_clustersize() {
-        var tester = new ValidationTester(11, new TestProperties().setHostedVespa(true).setQuota(quota));
+        var tester = new ValidationTester(11, false, new TestProperties().setHostedVespa(true).setQuota(quota));
         try {
             tester.deploy(null, getServices("testCluster", 11), Environment.prod, null);
             fail();
@@ -37,7 +37,7 @@ public class QuotaValidatorTest {
 
     @Test
     public void test_deploy_above_quota_budget() {
-        var tester = new ValidationTester(10, new TestProperties().setHostedVespa(true).setQuota(quota));
+        var tester = new ValidationTester(10, false, new TestProperties().setHostedVespa(true).setQuota(quota));
         try {
             tester.deploy(null, getServices("testCluster", 10), Environment.prod, null);
             fail();
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
index 2b3b1a9fcc7..b7fa72d8a64 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
@@ -40,8 +40,8 @@ public class ValidationTester {
     }
 
     /** Creates a validation tester with number of nodes available and the given test properties */
-    public ValidationTester(int nodeCount, TestProperties properties) {
-        this(new InMemoryProvisioner(nodeCount), properties);
+    public ValidationTester(int nodeCount, boolean sharedHosts, TestProperties properties) {
+        this(new InMemoryProvisioner(nodeCount, sharedHosts), properties);
     }
 
     /** Creates a validation tester with a given host provisioner */
@@ -51,7 +51,7 @@ public class ValidationTester {
 
     /** Creates a validation tester with a number of nodes available */
     public ValidationTester(int nodeCount) {
-        this(new InMemoryProvisioner(nodeCount), new TestProperties().setHostedVespa(true));
+        this(new InMemoryProvisioner(nodeCount, false), new TestProperties().setHostedVespa(true));
     }
 
     /** Creates a validation tester with a given host provisioner */
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ClusterSizeReductionValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ClusterSizeReductionValidatorTest.java
index 87684aca174..bade5a746f7 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ClusterSizeReductionValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ClusterSizeReductionValidatorTest.java
@@ -43,16 +43,6 @@ public class ClusterSizeReductionValidatorTest {
         tester.deploy(previous, getServices(2), Environment.prod, null);
     }
 
-    /*
-    @Test
-    public void testSizeReductionTo50PercentIsAllowed() throws IOException, SAXException {
-        ValidationTester tester = new ValidationTester(30);
-
-        VespaModel previous = tester.deploy(null, getServices(30), null).getFirst();
-        tester.deploy(previous, getServices(15), null);
-    }
-    */
-
     @Test
     public void testOverridingSizereductionValidation() {
         ValidationTester tester = new ValidationTester(30);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java
index 9a363789798..920e69e614b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ResourcesReductionValidatorTest.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.fail;
  */
 public class ResourcesReductionValidatorTest {
 
-    private final InMemoryProvisioner provisioner = new InMemoryProvisioner(30, new NodeResources(64, 128, 1000, 10));
+    private final InMemoryProvisioner provisioner = new InMemoryProvisioner(30, new NodeResources(64, 128, 1000, 10), false);
     private final ValidationTester tester = new ValidationTester(provisioner);
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartChangesDefersConfigChangesTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartChangesDefersConfigChangesTest.java
new file mode 100644
index 00000000000..35aa9a3c988
--- /dev/null
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartChangesDefersConfigChangesTest.java
@@ -0,0 +1,48 @@
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.vespa.model.application.validation.change;
+
+import com.yahoo.config.model.provision.InMemoryProvisioner;
+import com.yahoo.config.provision.Environment;
+import com.yahoo.config.provision.NodeResources;
+import com.yahoo.container.QrConfig;
+import com.yahoo.vespa.model.VespaModel;
+import com.yahoo.vespa.model.application.validation.ValidationTester;
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author bratseth
+ */
+public class RestartChangesDefersConfigChangesTest {
+
+    @Test
+    public void changes_requiring_restart_defers_config_changes() {
+        ValidationTester tester = new ValidationTester(new InMemoryProvisioner(5,
+                                                                               new NodeResources(1, 3, 9, 1),
+                                                                               true));
+        VespaModel gen1 = tester.deploy(null, getServices(5, 3), Environment.prod, null).getFirst();
+
+        // Change node count - no restart
+        VespaModel gen2 = tester.deploy(gen1, getServices(4, 3), Environment.prod, null).getFirst();
+        var config2 = new QrConfig.Builder();
+        gen2.getContainerClusters().get("default").getContainers().get(0).getConfig(config2);
+        assertFalse(config2.build().restartOnDeploy());
+
+        // Change memory amount - requires restart
+        VespaModel gen3 = tester.deploy(gen2, getServices(4, 2), Environment.prod, null).getFirst();
+        var config3 = new QrConfig.Builder();
+        gen3.getContainerClusters().get("default").getContainers().get(0).getConfig(config3);
+        assertTrue(config3.build().restartOnDeploy());
+    }
+
+    private static String getServices(int nodes, int memory) {
+        return "<services version='1.0'>" +
+               "  <container id='default' version='1.0'>" +
+               "    <nodes count='" + nodes + "'><resources vcpu='1' memory='" + memory + "Gb' disk='9Gb'/></nodes>" +
+               "   </container>" +
+               "</services>";
+    }
+
+}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java
index c7118618003..2d48f55d3d5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/ImplicitIndexingClusterTest.java
@@ -50,7 +50,7 @@ public class ImplicitIndexingClusterTest {
         ModelContext.Properties properties = new TestProperties().setMultitenant(true).setHostedVespa(true);
         DeployState.Builder deployStateBuilder = new DeployState.Builder()
                 .properties(properties)
-                .modelHostProvisioner(new InMemoryProvisioner(true, "host1.yahoo.com", "host2.yahoo.com", "host3.yahoo.com"));
+                .modelHostProvisioner(new InMemoryProvisioner(true, false, "host1.yahoo.com", "host2.yahoo.com", "host3.yahoo.com"));
 
         return new VespaModelCreatorWithMockPkg(new MockApplicationPackage.Builder()
                 .withServices("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + servicesXml)
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 7195a762478..f8046bfe92d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -618,7 +618,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
         String servicesXml = "<container id='default' version='1.0' />";
         ApplicationPackage applicationPackage = new MockApplicationPackage.Builder().withServices(servicesXml).build();
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), new DeployState.Builder()
-                .modelHostProvisioner(new InMemoryProvisioner(true, "host1.yahoo.com", "host2.yahoo.com"))
+                .modelHostProvisioner(new InMemoryProvisioner(true, false, "host1.yahoo.com", "host2.yahoo.com"))
                 .applicationPackage(applicationPackage)
                 .properties(new TestProperties()
                         .setMultitenant(true)
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
index b1550d90f35..297c0cebbb4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/utils/ContentClusterUtils.java
@@ -46,7 +46,7 @@ public class ContentClusterUtils {
     }
 
     public static MockRoot createMockRoot(String[] hosts, List<String> schemas) {
-        return createMockRoot(new InMemoryProvisioner(true, hosts), schemas);
+        return createMockRoot(new InMemoryProvisioner(true, false, hosts), schemas);
     }
 
     public static MockRoot createMockRoot(List<String> schemas) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index c985ebabbf9..f5250343afe 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -276,7 +276,7 @@ public class VespaModelTestCase {
                 .build();
         DeployState deployState = new DeployState.Builder()
                 .applicationPackage(applicationPackage)
-                .modelHostProvisioner(new InMemoryProvisioner(true, "host1.yahoo.com"))
+                .modelHostProvisioner(new InMemoryProvisioner(true, false, "host1.yahoo.com"))
                 .properties(new TestProperties()
                         .setConfigServerSpecs(Arrays.asList(new TestProperties.Spec("cfghost", 1234, 1236)))
                         .setMultitenant(true))
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
index cdfd9fab194..813ca4ac0cb 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
@@ -138,6 +138,7 @@ public class VespaModelTester {
 
         HostProvisioner provisioner = hosted ?
                                       new InMemoryProvisioner(hostsByResources, failOnOutOfCapacity, useMaxResources,
+                                                              false,
                                                               startIndexForClusters, retiredHostNames) :
                                       new SingleNodeProvisioner();