Merge pull request #14504 from vespa-engine/musum/shorter-wait-for-lock

Wait only a short time for the lock

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));
         }
     }