aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-10-08 10:27:42 +0200
committerMartin Polden <mpolden@mpolden.no>2020-10-08 10:27:42 +0200
commitc9b50dea761f751726704427f67228ccaf54c8aa (patch)
treee4bf07491e4218f1b7f33cc00e6140a0ae136491 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
parentced37852666ad480c485cab2e361e093381639df (diff)
Reduce LoadBalancerExpirer lock timeout
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
index 90cf3ba8f54..ca2a59ca6d4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
@@ -22,7 +22,7 @@ import java.util.logging.Level;
import java.util.stream.Collectors;
/**
- * Periodically expire load balancers.
+ * Periodically expire load balancers and de-provision inactive ones.
*
* Load balancers expire from the following states:
*
@@ -123,7 +123,7 @@ public class LoadBalancerExpirer extends NodeRepositoryMaintainer {
/** Apply operation to all load balancers that exist in given state, while holding lock */
private void withLoadBalancersIn(LoadBalancer.State state, Consumer<LoadBalancer> operation) {
for (var id : db.readLoadBalancerIds()) {
- try (var lock = db.lock(id.application())) {
+ try (var lock = db.lock(id.application(), Duration.ofSeconds(1))) {
var loadBalancer = db.readLoadBalancer(id);
if (loadBalancer.isEmpty()) continue; // Load balancer was removed during loop
if (loadBalancer.get().state() != state) continue; // Wrong state