diff options
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java index ff696e727fa..1f9a37d517a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java @@ -24,8 +24,6 @@ import java.util.function.Supplier; import java.util.logging.Level; import java.util.logging.Logger; -import static com.yahoo.vespa.flags.Flags.USE_APPLICATION_LOCK_IN_MAINTENANCE_DEPLOYMENT; - /** * A wrapper of a deployment suitable for maintenance. * This is a single-use, single-thread object. @@ -50,10 +48,7 @@ class MaintenanceDeployment implements Closeable { this.application = application; this.metric = metric; - Optional<Mutex> lock = USE_APPLICATION_LOCK_IN_MAINTENANCE_DEPLOYMENT.bindTo(nodeRepository.flagSource()).value() - ? tryLock(application, nodeRepository) - : Optional.of(() -> { }); - + Optional<Mutex> lock = tryLock(application, nodeRepository); try { deployment = tryDeployment(lock, application, deployer, nodeRepository); this.lock = lock; |