diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-08-14 19:40:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-14 19:40:35 +0200 |
commit | dcc7ecc2301e29934c7cd049f1d269725dbbd3d9 (patch) | |
tree | 8845b7302570289d6e5a06dce6f53a02772a2558 | |
parent | 25a4b1fa51e2803dc528d1726ea2eddc04e46eea (diff) | |
parent | bdbe12807a06abc279c7a5ea492de57907aca8a1 (diff) |
Merge pull request #27999 from vespa-engine/hakonhall/allow-upgrading-proxies-concurrently-with-proxyhosts
Allow upgrading proxies concurrently with proxyhosts
2 files changed, 9 insertions, 9 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 56b7ffd01f9..9d909cb5ebf 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 @@ -29,7 +29,7 @@ public enum SystemApplication { configServerHost(InfrastructureApplication.CONFIG_SERVER_HOST), configServer(InfrastructureApplication.CONFIG_SERVER), proxyHost(InfrastructureApplication.PROXY_HOST), - proxy(InfrastructureApplication.PROXY, proxyHost, configServer), + proxy(InfrastructureApplication.PROXY, configServer), tenantHost(InfrastructureApplication.TENANT_HOST); /** The tenant owning all system applications */ 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 a7360f3d2d8..d3d66715202 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 @@ -324,9 +324,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); @@ -341,12 +341,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.proxyHost, + SystemApplication.proxy), + version1, zone); convergeServices(SystemApplication.proxy, zone); - List<SystemApplication> lastToDowngrade = List.of(SystemApplication.configServer, - SystemApplication.proxyHost); + List<SystemApplication> lastToDowngrade = List.of(SystemApplication.configServer); assertWantedVersion(lastToDowngrade, version2, zone); // ... and then configserver and proxyhost |