diff options
4 files changed, 19 insertions, 16 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java index 19518b431b2..0b56591d6a1 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ConfigServerBootstrapTest.java @@ -60,7 +60,7 @@ public class ConfigServerBootstrapTest { @Test public void testBootstrap() throws Exception { ConfigserverConfig configserverConfig = createConfigserverConfig(temporaryFolder); - InMemoryProvisioner provisioner = new InMemoryProvisioner(true, "host0", "host1", "host3"); + InMemoryProvisioner provisioner = new InMemoryProvisioner(true, "host0", "host1", "host3", "host4"); DeployTester tester = new DeployTester(configserverConfig, provisioner); tester.deployApp("src/test/apps/hosted/"); @@ -93,7 +93,7 @@ public class ConfigServerBootstrapTest { @Test public void testBootstrapWithVipStatusFile() throws Exception { ConfigserverConfig configserverConfig = createConfigserverConfig(temporaryFolder); - InMemoryProvisioner provisioner = new InMemoryProvisioner(true, "host0", "host1", "host3"); + InMemoryProvisioner provisioner = new InMemoryProvisioner(true, "host0", "host1", "host3", "host4"); DeployTester tester = new DeployTester(configserverConfig, provisioner); tester.deployApp("src/test/apps/hosted/"); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java index 1b4ed2283ba..23326474371 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java @@ -72,6 +72,6 @@ public class ModelContextImplTest { assertFalse(context.properties().hostedVespa()); assertThat(context.properties().rotations(), equalTo(rotations)); assertThat(context.properties().isFirstTimeDeployment(), equalTo(false)); - assertThat(context.properties().useDedicatedNodeForLogserver(), equalTo(false)); + assertThat(context.properties().useDedicatedNodeForLogserver(), equalTo(true)); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java index c5d1e8dc0a1..805f264adf9 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java @@ -97,7 +97,7 @@ public class HostedDeployTest { DeployTester.createModelFactory(Version.fromString("7.0.0"), clock)); DeployTester tester = new DeployTester(modelFactories, createConfigserverConfig(), clock, Zone.defaultZone()); tester.deployApp("src/test/apps/hosted/", "6.2.0", Instant.now()); - assertEquals(3, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); + assertEquals(4, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); } /** @@ -108,7 +108,8 @@ public class HostedDeployTest { public void testCreateOnlyNeededModelVersions() { List<Host> hosts = Arrays.asList(createHost("host1", "6.0.0"), createHost("host2", "6.1.0"), - createHost("host3")); //Use a host with no version as well + createHost("host3"), //Use a host with no version as well + createHost("host4", "6.1.0")); InMemoryProvisioner provisioner = new InMemoryProvisioner(new Hosts(hosts), true); CountingModelFactory factory600 = DeployTester.createModelFactory(Version.fromString("6.0.0")); @@ -127,7 +128,7 @@ public class HostedDeployTest { DeployTester tester = new DeployTester(modelFactories, createConfigserverConfig(), Clock.systemUTC(), provisioner); // Deploy with version that does not exist on hosts, the model for this version should also be created tester.deployApp("src/test/apps/hosted/", "7.0.0", Instant.now()); - assertEquals(3, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); + assertEquals(4, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); // Check >0 not ==0 as the session watcher thread is running and will redeploy models in the background assertTrue(factory600.creationCount() > 0); @@ -145,7 +146,7 @@ public class HostedDeployTest { */ @Test public void testCreateOnlyNeededModelVersionsNewNodes() { - List<Host> hosts = Arrays.asList(createHost("host1"), createHost("host2"), createHost("host3")); + List<Host> hosts = Arrays.asList(createHost("host1"), createHost("host2"), createHost("host3"), createHost("host4")); InMemoryProvisioner provisioner = new InMemoryProvisioner(new Hosts(hosts), true); CountingModelFactory factory600 = DeployTester.createModelFactory(Version.fromString("6.0.0")); @@ -157,7 +158,7 @@ public class HostedDeployTest { DeployTester tester = new DeployTester(modelFactories, createConfigserverConfig(), Clock.systemUTC(), provisioner); // Deploy with version that does not exist on hosts, the model for this version should also be created tester.deployApp("src/test/apps/hosted/", "7.0.0", Instant.now()); - assertEquals(3, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); + assertEquals(4, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); // Check >0 not ==0 as the session watcher thread is running and will redeploy models in the background assertTrue(factory700.creationCount() > 0); @@ -195,7 +196,8 @@ public class HostedDeployTest { String newestOnNewMajorVersion = newestMajorVersion + ".2.0"; List<Host> hosts = Arrays.asList(createHost("host1", oldestVersion), createHost("host2", newestOnOldMajorVersion), - createHost("host3", newestOnOldMajorVersion)); + createHost("host3", newestOnOldMajorVersion), + createHost("host4", newestOnOldMajorVersion)); InMemoryProvisioner provisioner = new InMemoryProvisioner(new Hosts(hosts), true); CountingModelFactory factory1 = DeployTester.createModelFactory(Version.fromString(oldestVersion)); @@ -205,7 +207,7 @@ public class HostedDeployTest { DeployTester tester = new DeployTester(modelFactories, createConfigserverConfig(), Clock.systemUTC(), provisioner); tester.deployApp("src/test/apps/hosted/", oldestVersion, Instant.now()); - assertEquals(3, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); + assertEquals(4, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); // Check >0 not ==0 as the session watcher thread is running and will redeploy models in the background assertTrue(factory1.creationCount() > 0); @@ -256,7 +258,7 @@ public class HostedDeployTest { @Test public void testAccessControlIsOnlyCheckedWhenNoProdDeploymentExists() { // Provisioner does not reuse hosts, so need twice as many hosts as app requires - List<Host> hosts = IntStream.rangeClosed(1,6).mapToObj(i -> createHost("host" + i, "6.0.0")).collect(Collectors.toList()); + List<Host> hosts = IntStream.rangeClosed(1,8).mapToObj(i -> createHost("host" + i, "6.0.0")).collect(Collectors.toList()); InMemoryProvisioner provisioner = new InMemoryProvisioner(new Hosts(hosts), true); CountingModelFactory factory600 = DeployTester.createModelFactory(Version.fromString("6.0.0")); @@ -269,12 +271,12 @@ public class HostedDeployTest { ApplicationId applicationId = tester.applicationId(); // Deploy with oldest version tester.deployApp("src/test/apps/hosted/", "6.0.0", Instant.now()); - assertEquals(3, tester.getAllocatedHostsOf(applicationId).getHosts().size()); + assertEquals(4, tester.getAllocatedHostsOf(applicationId).getHosts().size()); // Deploy with version that does not exist on hosts and with app package that has no write access control, // validation of access control should not be done, since the app is already deployed in prod tester.deployApp("src/test/apps/hosted-no-write-access-control", "6.1.0", Instant.now()); - assertEquals(3, tester.getAllocatedHostsOf(applicationId).getHosts().size()); + assertEquals(4, tester.getAllocatedHostsOf(applicationId).getHosts().size()); } @Test @@ -321,7 +323,8 @@ public class HostedDeployTest { public void testThatConfigChangeActionsAreCollectedFromAllModels() { List<Host> hosts = Arrays.asList(createHost("host1", "6.1.0"), createHost("host2", "6.2.0"), - createHost("host3", "6.2.0")); + createHost("host3", "6.2.0"), + createHost("host4", "6.2.0")); InMemoryProvisioner provisioner = new InMemoryProvisioner(new Hosts(hosts), true); List<ServiceInfo> services = Collections.singletonList( new ServiceInfo("serviceName", "serviceType", null, new HashMap<>(), "configId", "hostName")); @@ -333,7 +336,7 @@ public class HostedDeployTest { DeployTester tester = new DeployTester(modelFactories, createConfigserverConfig(), Clock.systemUTC(), provisioner); PrepareResult prepareResult = tester.deployApp("src/test/apps/hosted/", "6.2.0", Instant.now()); - assertEquals(3, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); + assertEquals(4, tester.getAllocatedHostsOf(tester.applicationId()).getHosts().size()); List<RestartActions.Entry> actions = prepareResult.configChangeActions().getRestartActions().getEntries(); assertThat(actions.size(), is(1)); assertThat(actions.get(0).getMessages(), equalTo(ImmutableSet.of("change", "other change"))); diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index a5dcec232f8..c790fc5659e 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -64,7 +64,7 @@ public class Flags { HOSTNAME, NODE_TYPE); public static final UnboundBooleanFlag USE_DEDICATED_NODE_FOR_LOGSERVER = defineFeatureFlag( - "use-dedicated-node-for-logserver", false, + "use-dedicated-node-for-logserver", true, "Whether to use a dedicated node for the logserver.", "Takes effect at redeployment", APPLICATION_ID); |