diff options
| author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
|---|---|---|
| committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
| commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
| tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java | |
| parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
| parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) | |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java | 5 |
1 files changed, 3 insertions, 2 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 4f2201adba0..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 @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.maintenance; import com.yahoo.config.provision.Environment; @@ -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", |