diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-09-23 13:28:56 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-09-23 13:28:56 +0200 |
commit | a1a76e86064fda3c93b40cfb3d79e8f02c9a88be (patch) | |
tree | d65865884b237af9ae0de383ec80da457b44c513 /node-repository/src/main/java/com | |
parent | 4f2572fa8b1e50ca7e36b3a0fdf2baac59c6cbec (diff) |
Wait only a short time for the lock
Diffstat (limited to 'node-repository/src/main/java/com')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java index b0c52d10f7d..db0e5f03097 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java @@ -62,7 +62,8 @@ public class ScalingSuggestionsMaintainer extends NodeRepositoryMaintainer { Optional<Cluster> cluster = application.cluster(clusterId); if (cluster.isEmpty()) return; Optional<ClusterResources> suggestion = autoscaler.suggest(cluster.get(), clusterNodes); - try (Mutex lock = nodeRepository().lock(applicationId)) { + // Wait only a short time for the lock to avoid interfering with change deployments + try (Mutex lock = nodeRepository().lock(applicationId, Duration.ofSeconds(1))) { applications().get(applicationId).ifPresent(a -> storeSuggestion(suggestion, clusterId, a, lock)); } } |