diff options
author | Harald Musum <musum@yahooinc.com> | 2024-04-18 14:28:17 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2024-04-18 14:28:17 +0200 |
commit | 4f294a2ad6c6ffe658f05a4dda44662ad461dc59 (patch) | |
tree | 9733e579726d58a5400bcab8aa324d5831b23f1a /node-repository | |
parent | 4ef45a0ea202f0fc6654c7cf32ba8be2ca82efd6 (diff) |
timeout -> expiryTime for node repo expirers
Diffstat (limited to 'node-repository')
3 files changed, 12 insertions, 12 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DirtyExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DirtyExpirer.java index ab103b0bfcf..939c958efdd 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DirtyExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DirtyExpirer.java @@ -27,8 +27,8 @@ public class DirtyExpirer extends Expirer { private final boolean wantToDeprovisionOnExpiry; - DirtyExpirer(NodeRepository nodeRepository, Duration dirtyTimeout, Metric metric) { - super(Node.State.dirty, History.Event.Type.deallocated, nodeRepository, dirtyTimeout, metric); + DirtyExpirer(NodeRepository nodeRepository, Duration expiryTime, Metric metric) { + super(Node.State.dirty, History.Event.Type.deallocated, nodeRepository, expiryTime, metric); // Deprovision hosts on expiry if dynamically provisioned this.wantToDeprovisionOnExpiry = nodeRepository.zone().cloud().dynamicProvisioning(); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java index d97f4566e57..76abf5c2aef 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java @@ -16,7 +16,7 @@ import java.util.List; /** * Maintenance job which moves inactive nodes to dirty or parked after timeout. * - * The timeout is in place to provide a grace period in which nodes can be brought back to active + * The expiry time is in place to provide a grace period in which nodes can be brought back to active * if they were deactivated in error. As inactive nodes retain their state * they can be brought back to active and correct state faster than a new node. * @@ -32,12 +32,12 @@ import java.util.List; public class InactiveExpirer extends Expirer { private final NodeRepository nodeRepository; - private final Duration timeout; + private final Duration expiryTime; - InactiveExpirer(NodeRepository nodeRepository, Duration timeout, Metric metric) { - super(Node.State.inactive, History.Event.Type.deactivated, nodeRepository, timeout, metric); + InactiveExpirer(NodeRepository nodeRepository, Duration expiryTime, Metric metric) { + super(Node.State.inactive, History.Event.Type.deactivated, nodeRepository, expiryTime, metric); this.nodeRepository = nodeRepository; - this.timeout = timeout; + this.expiryTime = expiryTime; } @Override @@ -49,12 +49,12 @@ public class InactiveExpirer extends Expirer { @Override protected boolean isExpired(Node node) { - return super.isExpired(node, timeout(node)) || + return super.isExpired(node, expiryTime(node)) || node.allocation().get().owner().instance().isTester(); } - private Duration timeout(Node node) { - return timeout; + private Duration expiryTime(Node node) { + return expiryTime; } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirer.java index 24901cb10a9..adcc486d5b4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ProvisionedExpirer.java @@ -27,8 +27,8 @@ public class ProvisionedExpirer extends Expirer { private final NodeRepository nodeRepository; - ProvisionedExpirer(NodeRepository nodeRepository, Duration timeout, Metric metric) { - super(Node.State.provisioned, History.Event.Type.provisioned, nodeRepository, timeout, metric); + ProvisionedExpirer(NodeRepository nodeRepository, Duration expiryTime, Metric metric) { + super(Node.State.provisioned, History.Event.Type.provisioned, nodeRepository, expiryTime, metric); this.nodeRepository = nodeRepository; } |