summaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com/yahoo/config/model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-10-09 14:37:58 +0200
committerJon Bratseth <bratseth@gmail.com>2020-10-09 14:37:58 +0200
commit4e6f7776fee9461dc8c7e4364b774c04916f99d4 (patch)
tree93dbb0188599ecb24286c6222a2a27d0a47aa1b0 /config-model/src/test/java/com/yahoo/config/model
parent2e3515a187d0b3aae7ae1afd2708f011b9b8bf22 (diff)
Signal deference of config change application until restart
When a restart needs to be done, processes should not apply new config until restarted. This signals to clusters in the config model when this obtains, but this is a no-op for now.
Diffstat (limited to 'config-model/src/test/java/com/yahoo/config/model')
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java6
1 files changed, 4 insertions, 2 deletions
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 1be58564d1b..26d8a9b0eca 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
@@ -444,12 +444,14 @@ public class ModelProvisioningTest {
// Check container cluster
assertEquals(1, model.getContainerClusters().size());
- Set<com.yahoo.vespa.model.Host> containerHosts = model.getContainerClusters().get("foo").getContainers().stream().map(Container::getHost).collect(Collectors.toSet());
+ Set<HostResource> containerHosts = model.getContainerClusters().get("foo").getContainers().stream()
+ .map(Container::getHost)
+ .collect(Collectors.toSet());
assertEquals(10, containerHosts.size());
// Check admin clusters
Admin admin = model.getAdmin();
- Set<com.yahoo.vespa.model.Host> slobrokHosts = admin.getSlobroks().stream().map(Slobrok::getHost).collect(Collectors.toSet());
+ Set<HostResource> slobrokHosts = admin.getSlobroks().stream().map(Slobrok::getHost).collect(Collectors.toSet());
assertEquals(3, slobrokHosts.size());
assertTrue("Slobroks are assigned from container nodes", containerHosts.containsAll(slobrokHosts));
assertTrue("Logserver is assigned from container nodes", containerHosts.contains(admin.getLogserver().getHost()));