diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2022-01-04 11:46:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-04 11:46:22 +0100 |
commit | c83ed1b68b40704a9c4b45a004e162404f3b34b9 (patch) | |
tree | a093e27a4baf6c98a780655ed9eece24df5836b6 /controller-api | |
parent | ef82c54cde78e05a49a3087d9353dbb955cdb150 (diff) | |
parent | 2ab57aec0a53924fae3291d9f89af8aecc3aa8e9 (diff) |
Merge pull request #20629 from vespa-engine/mpolden/downgrade
Support aborting and rolling back incomplete upgrade
Diffstat (limited to 'controller-api')
2 files changed, 3 insertions, 3 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java index 0208f9ecd0d..395f0642965 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java @@ -55,7 +55,7 @@ public interface NodeRepository { void removeArchiveUri(ZoneId zone, TenantName tenantName); /** Upgrade all nodes of given type to a new version */ - void upgrade(ZoneId zone, NodeType type, Version version); + void upgrade(ZoneId zone, NodeType type, Version version, boolean allowDowngrade); /** Upgrade OS for all nodes of given type to a new version */ void upgradeOs(ZoneId zone, NodeType type, Version version, Duration upgradeBudget); diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/SystemMonitor.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/SystemMonitor.java index 20dd0a8739d..f1fe2524e99 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/SystemMonitor.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/SystemMonitor.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.organization; import com.yahoo.component.Version; /** - * Montitors a Vespa controller and its system. + * Monitors a Vespa controller and its system. * * @author jonmv */ @@ -14,7 +14,7 @@ public interface SystemMonitor { void reportSystemVersion(Version systemVersion, Confidence confidence); enum Confidence { - broken, low, normal, high; + aborted, broken, low, normal, high; } } |