diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2018-05-20 09:24:46 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2018-05-20 09:24:46 +0200 |
commit | e8e944725066e936691ac029bc384c9cc5e013e8 (patch) | |
tree | 6efb961af82829708e611a747836c37661040a6f /controller-server | |
parent | adbccf21b980f16486af7a516d4db7adc1a813a0 (diff) |
Use top-sort and a DAG to express deps and parallelism
Diffstat (limited to 'controller-server')
2 files changed, 14 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 f264251361a..0d2c9fbda8b 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 @@ -18,14 +18,17 @@ 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), - zone(ApplicationId.from("hosted-vespa", "routing", "default"), NodeType.proxy); + zone(ApplicationId.from("hosted-vespa", "routing", "default"), NodeType.proxy, + configServerHost, proxyHost, configServer); private final ApplicationId id; private final NodeType nodeType; + private final List<SystemApplication> prerequisites; - SystemApplication(ApplicationId id, NodeType nodeType) { + SystemApplication(ApplicationId id, NodeType nodeType, SystemApplication ... prerequisites) { this.id = id; this.nodeType = nodeType; + this.prerequisites = Arrays.asList(prerequisites); } public ApplicationId id() { @@ -37,16 +40,14 @@ public enum SystemApplication { return nodeType; } + /** Returns the system applications that should upgrade before this */ + public List<SystemApplication> prerequisites() { return prerequisites; } + /** Returns whether this system application has an application package */ public boolean hasApplicationPackage() { return nodeType == NodeType.proxy; } - /** Returns whether this system application must be upgraded in the declared order */ - public boolean upgradeInOrder() { - return nodeType != NodeType.confighost && nodeType != NodeType.proxyhost; - } - /** All known system applications */ public static List<SystemApplication> all() { return Arrays.asList(values()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java index d6addf19b44..79c77992291 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/SystemUpgrader.java @@ -43,11 +43,12 @@ public class SystemUpgrader extends Maintainer { /** Deploy a list of system applications on given version */ private void deploy(List<SystemApplication> applications, Version target) { for (List<ZoneId> zones : controller().zoneRegistry().upgradePolicy().asList()) { - for (SystemApplication application : applications) { - if (!deploy(zones, application, target) && application.upgradeInOrder()) { - return; - } - } + int done = 0; + for (SystemApplication application : applications) + if (application.prerequisites().stream().allMatch(prerequisite -> deploy(zones, prerequisite, target)) + && deploy(zones, application, target)) + done++; + if (done < applications.size()) return; } } |