diff options
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java | 88 |
1 files changed, 45 insertions, 43 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java index c09d3ec3a92..3ccd7e695c7 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgraderTest.java @@ -11,7 +11,7 @@ import com.yahoo.vespa.hosted.controller.application.SystemApplication; import com.yahoo.vespa.hosted.controller.integration.NodeRepositoryMock; import com.yahoo.vespa.hosted.controller.integration.ZoneApiMock; import com.yahoo.vespa.hosted.controller.versions.VespaVersion; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.List; @@ -19,9 +19,9 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author mpolden @@ -36,19 +36,19 @@ public class SystemUpgraderTest { private final ControllerTester tester = new ControllerTester(); @Test - public void upgrade_system() { + void upgrade_system() { SystemUpgrader systemUpgrader = systemUpgrader( UpgradePolicy.builder() - .upgrade(zone1) - .upgradeInParallel(zone2, zone3) - .upgrade(zone4) - .build() + .upgrade(zone1) + .upgradeInParallel(zone2, zone3) + .upgrade(zone4) + .build() ); Version version1 = Version.fromString("6.5"); // Bootstrap a system without host applications tester.configServer().bootstrap(List.of(zone1.getId(), zone2.getId(), zone3.getId(), zone4.getId()), - SystemApplication.configServer, SystemApplication.proxy); + SystemApplication.configServer, SystemApplication.proxy); // Fail a few nodes. Failed nodes should not affect versions failNodeIn(zone1, SystemApplication.configServer); failNodeIn(zone3, SystemApplication.proxy); @@ -78,8 +78,8 @@ public class SystemUpgraderTest { systemUpgrader.maintain(); assertWantedVersion(SystemApplication.proxy, version2, zone1); completeUpgrade(SystemApplication.proxy, version2, zone1); - assertTrue("Deployed proxy application", - tester.configServer().application(SystemApplication.proxy.id(), zone1.getId()).isPresent()); + assertTrue(tester.configServer().application(SystemApplication.proxy.id(), zone1.getId()).isPresent(), + "Deployed proxy application"); // zone 2, 3 and 4: still targets old version assertWantedVersion(SystemApplication.configServer, version1, zone2, zone3, zone4); @@ -138,12 +138,12 @@ public class SystemUpgraderTest { } @Test - public void upgrade_controller_with_non_converging_application() { + void upgrade_controller_with_non_converging_application() { SystemUpgrader systemUpgrader = systemUpgrader(UpgradePolicy.builder().upgrade(zone1).build()); // Bootstrap system tester.configServer().bootstrap(List.of(zone1.getId()), SystemApplication.configServer, - SystemApplication.proxy); + SystemApplication.proxy); Version version1 = Version.fromString("6.5"); tester.upgradeSystem(version1); @@ -173,13 +173,13 @@ public class SystemUpgraderTest { } @Test - public void upgrade_system_containing_host_applications() { + void upgrade_system_containing_host_applications() { SystemUpgrader systemUpgrader = systemUpgrader( UpgradePolicy.builder() - .upgrade(zone1) - .upgradeInParallel(zone2, zone3) - .upgrade(zone4) - .build() + .upgrade(zone1) + .upgradeInParallel(zone2, zone3) + .upgrade(zone4) + .build() ); Version version1 = Version.fromString("6.5"); @@ -196,9 +196,9 @@ public class SystemUpgraderTest { // System upgrades in zone 1: systemUpgrader.maintain(); List<SystemApplication> allExceptZone = List.of(SystemApplication.configServerHost, - SystemApplication.configServer, - SystemApplication.proxyHost, - SystemApplication.tenantHost); + SystemApplication.configServer, + SystemApplication.proxyHost, + SystemApplication.tenantHost); completeUpgrade(allExceptZone, version2, zone1); systemUpgrader.maintain(); completeUpgrade(SystemApplication.proxy, version2, zone1); @@ -225,7 +225,7 @@ public class SystemUpgraderTest { } @Test - public void downgrading_controller_never_downgrades_system() { + void downgrading_controller_never_downgrades_system() { SystemUpgrader systemUpgrader = systemUpgrader(UpgradePolicy.builder().upgrade(zone1).build()); Version version = Version.fromString("6.5"); @@ -244,7 +244,7 @@ public class SystemUpgraderTest { } @Test - public void upgrade_halts_on_broken_version() { + void upgrade_halts_on_broken_version() { SystemUpgrader systemUpgrader = systemUpgrader(UpgradePolicy.builder().upgrade(zone1).upgrade(zone2).build()); // Initial system version @@ -252,11 +252,11 @@ public class SystemUpgraderTest { tester.upgradeSystem(version1); systemUpgrader.maintain(); assertCurrentVersion(List.of(SystemApplication.configServerHost, SystemApplication.proxyHost, - SystemApplication.configServer, SystemApplication.proxy), - version1, zone1); + SystemApplication.configServer, SystemApplication.proxy), + version1, zone1); assertCurrentVersion(List.of(SystemApplication.configServerHost, SystemApplication.proxyHost, - SystemApplication.configServer, SystemApplication.proxy), - version1, zone2); + SystemApplication.configServer, SystemApplication.proxy), + version1, zone2); // System starts upgrading to next version Version version2 = Version.fromString("6.6"); @@ -273,13 +273,13 @@ public class SystemUpgraderTest { overrideConfidence(version2, VespaVersion.Confidence.broken); systemUpgrader.maintain(); assertWantedVersion(List.of(SystemApplication.configServerHost, SystemApplication.proxyHost, - SystemApplication.configServer, SystemApplication.proxy), version1, zone2); + SystemApplication.configServer, SystemApplication.proxy), version1, zone2); } @Test - public void does_not_deploy_proxy_app_in_zone_without_shared_routing() { + void does_not_deploy_proxy_app_in_zone_without_shared_routing() { var applications = List.of(SystemApplication.configServerHost, SystemApplication.configServer, - SystemApplication.tenantHost); + SystemApplication.tenantHost); tester.configServer().bootstrap(List.of(zone1.getId()), applications); tester.configServer().disallowConvergenceCheck(SystemApplication.proxy.id()); tester.zoneRegistry().exclusiveRoutingIn(zone1); @@ -301,7 +301,7 @@ public class SystemUpgraderTest { } @Test - public void downgrade_from_aborted_version() { + void downgrade_from_aborted_version() { SystemUpgrader systemUpgrader = systemUpgrader(UpgradePolicy.builder().upgrade(zone1).upgrade(zone2).upgrade(zone3).build()); Version version1 = Version.fromString("6.5"); @@ -319,9 +319,9 @@ public class SystemUpgraderTest { for (var zone : List.of(zone1, zone2)) { systemUpgrader.maintain(); completeUpgrade(List.of(SystemApplication.tenantHost, - SystemApplication.proxyHost, - SystemApplication.configServerHost), - version2, zone); + SystemApplication.proxyHost, + SystemApplication.configServerHost), + version2, zone); completeUpgrade(SystemApplication.configServer, version2, zone); systemUpgrader.maintain(); completeUpgrade(SystemApplication.proxy, version2, zone); @@ -336,12 +336,12 @@ public class SystemUpgraderTest { for (var zone : List.of(zone2, zone1)) { systemUpgrader.maintain(); completeUpgrade(List.of(SystemApplication.tenantHost, - SystemApplication.configServerHost, - SystemApplication.proxy), - version1, zone); + SystemApplication.configServerHost, + SystemApplication.proxy), + version1, zone); convergeServices(SystemApplication.proxy, zone); List<SystemApplication> lastToDowngrade = List.of(SystemApplication.configServer, - SystemApplication.proxyHost); + SystemApplication.proxyHost); assertWantedVersion(lastToDowngrade, version2, zone); // ... and then configserver and proxyhost @@ -359,7 +359,8 @@ public class SystemUpgraderTest { try { overrideConfidence(version3, VespaVersion.Confidence.aborted); fail("Expected exception"); - } catch (IllegalArgumentException ignored) {} + } catch (IllegalArgumentException ignored) { + } systemUpgrader.maintain(); assertWantedVersion(SystemApplication.notController(), version3, zone1, zone2, zone3); } @@ -414,8 +415,9 @@ public class SystemUpgraderTest { private void assertWantedVersion(SystemApplication application, Version version, ZoneApi first, ZoneApi... rest) { Stream.concat(Stream.of(first), Stream.of(rest)).forEach(zone -> { if (!application.hasApplicationPackage()) { - assertEquals("Target version set for " + application + " in " + zone.getId(), version, - nodeRepository().targetVersionsOf(zone.getId()).vespaVersion(application.nodeType()).orElse(Version.emptyVersion)); + assertEquals(version, + nodeRepository().targetVersionsOf(zone.getId()).vespaVersion(application.nodeType()).orElse(Version.emptyVersion), + "Target version set for " + application + " in " + zone.getId()); } assertVersion(application, version, Node::wantedVersion, zone); }); @@ -437,7 +439,7 @@ public class SystemUpgraderTest { ZoneApi first, ZoneApi... rest) { Stream.concat(Stream.of(first), Stream.of(rest)).forEach(zone -> { for (Node node : listNodes(zone, application)) { - assertEquals("Version of " + application.id() + " in " + zone.getId(), version, versionField.apply(node)); + assertEquals(version, versionField.apply(node), "Version of " + application.id() + " in " + zone.getId()); } }); } |