aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-12-17 14:48:49 +0100
committerMartin Polden <mpolden@mpolden.no>2022-01-03 10:57:07 +0100
commit2ab57aec0a53924fae3291d9f89af8aecc3aa8e9 (patch)
tree658c04613460db470926d3ee9a71ceb9bb0fd662 /controller-api
parentbb6c3856cf27c093d868ff743205acb427033be8 (diff)
Support aborting and rolling back incomplete upgrade
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java2
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/SystemMonitor.java4
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;
}
}