aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Meland <bjormel@users.noreply.github.com>2023-10-26 11:35:35 +0000
committerGitHub <noreply@github.com>2023-10-26 11:35:35 +0000
commite265aa096f9888f9bc996ed33ed2ca39a1dee7ef (patch)
treea9338bf9e18944d5fd6cab6be7882ae3b441e1e3
parent7dcf21422fc3e3616524342d23bf8cf197fdb6ed (diff)
parentd976274ea7fc5165f2ea532bc47e596e830f47e1 (diff)
Merge pull request #29108 from vespa-engine/bjormel/Only_forcing_de-provisioning_of_off_premises_nodes_
Only force de-provisioning of off premises nodes
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
index 0f1d3e93cc3..c3fea72fab9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
@@ -99,7 +99,8 @@ public class FailedExpirer extends NodeRepositoryMaintainer {
.map(Node::hostname)
.toList();
if (unparkedChildren.isEmpty()) {
- return Optional.of(nodeRepository.nodes().park(node.hostname(), true, Agent.FailedExpirer,
+ // Only forcing de-provisioning of off premises nodes
+ return Optional.of(nodeRepository.nodes().park(node.hostname(), nodeRepository.zone().cloud().dynamicProvisioning(), Agent.FailedExpirer,
"Parked by FailedExpirer due to " + reason.get()));
} else {
log.info(String.format("Expired failed node %s was not parked because of unparked children: %s",