diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-05-22 16:56:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-22 16:56:06 +0200 |
commit | d0ab342c70dcc143b6a224667d8e95c33e44a28b (patch) | |
tree | 27e9dd2f4fed8dcdb404305b203e7fdabdf22515 | |
parent | e36165320f34807bd2ea53e920c5d24c496d44a0 (diff) | |
parent | bbb2a4d2e6bdeff2fa86c08e0f5434816e1b1037 (diff) |
Merge pull request #9486 from vespa-engine/freva/revert-9176
Upgrade config server together with config server host
2 files changed, 7 insertions, 12 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java index 708133d2a07..26233c998f8 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java @@ -22,7 +22,7 @@ public enum SystemApplication { configServerHost(ApplicationId.from("hosted-vespa", "configserver-host", "default"), NodeType.confighost), proxyHost(ApplicationId.from("hosted-vespa", "proxy-host", "default"), NodeType.proxyhost), - configServer(ApplicationId.from("hosted-vespa", "zone-config-servers", "default"), NodeType.config, configServerHost), + configServer(ApplicationId.from("hosted-vespa", "zone-config-servers", "default"), NodeType.config), zone(ApplicationId.from("hosted-vespa", "routing", "default"), Set.of(NodeType.proxy, NodeType.host), configServerHost, proxyHost, configServer); 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 7f558131dd0..d28b36265e3 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 @@ -196,11 +196,10 @@ public class SystemUpgraderTest { // System upgrades in zone 1: systemUpgrader.maintain(); - List<SystemApplication> allExceptZoneAndConfig = List.of(SystemApplication.configServerHost, - SystemApplication.proxyHost); - completeUpgrade(allExceptZoneAndConfig, version2, zone1); - systemUpgrader.maintain(); - completeUpgrade(SystemApplication.configServer, version2, zone1); + List<SystemApplication> allExceptZone = List.of(SystemApplication.configServerHost, + SystemApplication.configServer, + SystemApplication.proxyHost); + completeUpgrade(allExceptZone, version2, zone1); systemUpgrader.maintain(); completeUpgrade(SystemApplication.zone, version2, zone1); convergeServices(SystemApplication.zone, zone1); @@ -208,9 +207,7 @@ public class SystemUpgraderTest { // zone 2 and 3: systemUpgrader.maintain(); - completeUpgrade(allExceptZoneAndConfig, version2, zone2, zone3); - systemUpgrader.maintain(); - completeUpgrade(SystemApplication.configServer, version2, zone2, zone3); + completeUpgrade(allExceptZone, version2, zone2, zone3); systemUpgrader.maintain(); completeUpgrade(SystemApplication.zone, version2, zone2, zone3); convergeServices(SystemApplication.zone, zone2, zone3); @@ -218,9 +215,7 @@ public class SystemUpgraderTest { // zone 4: systemUpgrader.maintain(); - completeUpgrade(allExceptZoneAndConfig, version2, zone4); - systemUpgrader.maintain(); - completeUpgrade(SystemApplication.configServer, version2, zone4); + completeUpgrade(allExceptZone, version2, zone4); systemUpgrader.maintain(); completeUpgrade(SystemApplication.zone, version2, zone4); |