diff options
author | Harald Musum <musum@yahooinc.com> | 2021-09-16 15:12:13 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-09-16 15:12:13 +0200 |
commit | 267b3bb9232a348a5387af6fa35fc6c3d44b627b (patch) | |
tree | deeb14ab3f692a03293d7b3a334fc71255793cd2 /node-repository | |
parent | 511170c43b976486e43433f4b796e33e98d3519c (diff) |
Add flag for whether to use application in MaintenanceDeployment
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java | 8 |
1 files changed, 7 insertions, 1 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 892372f27e7..9cffc361444 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 @@ -23,6 +23,8 @@ 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. @@ -46,7 +48,11 @@ class MaintenanceDeployment implements Closeable { NodeRepository nodeRepository) { this.application = application; this.metric = metric; - Optional<Mutex> lock = tryLock(application, nodeRepository); + + Optional<Mutex> lock = USE_APPLICATION_LOCK_IN_MAINTENANCE_DEPLOYMENT.bindTo(nodeRepository.flagSource()).value() + ? tryLock(application, nodeRepository) + : Optional.of(() -> { }); + try { deployment = tryDeployment(lock, application, deployer, nodeRepository); this.lock = lock; |